Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop
commit5c6ee67f9ef25626dc58a1ac39c6231b019a5f14
authorPeter Krenesky <peter@osuosl.org>
Fri, 17 Jun 2011 15:38:21 +0000 (17 08:38 -0700)
committerPeter Krenesky <peter@osuosl.org>
Fri, 17 Jun 2011 15:38:21 +0000 (17 08:38 -0700)
tree3f58544b57b115691bb4de0613da83d6fa1cd2ef
parenta5d24c1167bc9ac58dc4d4a405c3c61333e1ca3a
parente1c97f3ed9605116358ecee5c52731f054ee2977
Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop