Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop
commitf95b463beaf1583b68497768a46fac511aed146a
authorPeter Krenesky <peter@osuosl.org>
Fri, 27 May 2011 15:28:44 +0000 (27 08:28 -0700)
committerPeter Krenesky <peter@osuosl.org>
Fri, 27 May 2011 15:28:44 +0000 (27 08:28 -0700)
treed9136924e575fef165ae22b24d6db379d38c1b8d
parente4232d694c46bfab408148ae8f7659f5183825a8
parentd4316f9bdb18cf0e2e03492e06db5441505cd723
Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop