Merge branch 'master' of ssh://git.planet-lab.org/git/monitor
Stephen Soltesz [Thu, 6 Oct 2011 23:32:04 +0000 (19:32 -0400)]
1  2 
web/MonitorWeb/monitorweb/controllers.py