Merge branch 'release/0.7' of git.osuosl.org:ganeti/ganeti_webmgr into release/0.7
commita5b69ff64d834a8d841ff0442926085abbb35466
authorPeter Krenesky <peter@osuosl.org>
Fri, 10 Jun 2011 13:54:57 +0000 (10 06:54 -0700)
committerPeter Krenesky <peter@osuosl.org>
Fri, 10 Jun 2011 13:54:57 +0000 (10 06:54 -0700)
tree9dd9bb7024cb194e84a0df0c2e66ab919be5f917
parent1d4e95f49b61164e091708c669b639e922f7f61d
parent9cbc09f8bfd72da98a68ff272443f9f7782598ca
Merge branch 'release/0.7' of git.osuosl.org:ganeti/ganeti_webmgr into release/0.7