Merge branch 'release/0.7' of git.osuosl.org:ganeti/ganeti_webmgr into release/0.7
commit5497cdfe82ea33fa61b577037aded008104db224
authorPeter Krenesky <peter@osuosl.org>
Tue, 7 Jun 2011 22:46:24 +0000 (7 15:46 -0700)
committerPeter Krenesky <peter@osuosl.org>
Tue, 7 Jun 2011 22:46:24 +0000 (7 15:46 -0700)
tree7e38e5d3d59940d51e57b30e9de80df422681b9a
parentccecff454b7ec43bddaaba3bb96c881d466e82f7
parent8d586eb54618fad669638eeefb81a286a81b0f81
Merge branch 'release/0.7' of git.osuosl.org:ganeti/ganeti_webmgr into release/0.7