From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Fri, 23 Dec 2011 23:17:47 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/monitor
X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=f6e368170a4e55dc0f6ccd51bf419ceec99e85c6

Merge branch 'master' of ssh://git.planet-lab.org/git/monitor
---

f6e368170a4e55dc0f6ccd51bf419ceec99e85c6