Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop
commit562d18cfe635519475d378451a75b15c5505c1dd
authorPeter Krenesky <peter@osuosl.org>
Thu, 19 May 2011 03:17:26 +0000 (18 20:17 -0700)
committerPeter Krenesky <peter@osuosl.org>
Thu, 19 May 2011 03:17:26 +0000 (18 20:17 -0700)
tree798ddceb7adacd5970a572feb0d0b016a9e1e6a9
parentdd6db4c59c86f4c22fe666d59c09c1c02de10a4e
parent29429c48192f5f9ba85f2262a21eccd70c6933dc
Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop