Merge branch 'master' of ssh://git.planet-lab.org/git/monitor
authorStephen Soltesz <soltesz@cs.princeton.edu>
Thu, 6 Oct 2011 23:32:04 +0000 (19:32 -0400)
committerStephen Soltesz <soltesz@cs.princeton.edu>
Thu, 6 Oct 2011 23:32:04 +0000 (19:32 -0400)
commit5dd8a0f356100ed9369f54ac764e058adc4c3c90
treeabe0191e1cf312ac3bd2b2c00f592a2288960f91
parentbd5fd5bfc5e998b3ac022c8cd6c5f14fef83207d
parentdb5b22763389bc0ac30dac25576589b85c02ac10
Merge branch 'master' of ssh://git.planet-lab.org/git/monitor
web/MonitorWeb/monitorweb/controllers.py