Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop
commit1358b0a270863ad51924e24ec59def8bc836b2a3
authorPeter Krenesky <peter@osuosl.org>
Wed, 8 Jun 2011 20:56:07 +0000 (8 13:56 -0700)
committerPeter Krenesky <peter@osuosl.org>
Wed, 8 Jun 2011 20:56:07 +0000 (8 13:56 -0700)
tree2d60d0cc383b61da20b46134ed4ea17eccd8178b
parente93de734f0e16f950697e41d4f09abc11f90cbfa
parent842baf509202d64fc85c7c9d74fa1383898e13ea
Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop