Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop
commit76cc28908e90a3c14da7d2edbb717c52b466020f
authorPeter Krenesky <peter@osuosl.org>
Fri, 3 Jun 2011 14:46:47 +0000 (3 07:46 -0700)
committerPeter Krenesky <peter@osuosl.org>
Fri, 3 Jun 2011 14:46:47 +0000 (3 07:46 -0700)
tree3b63c7b3b7d3f35d6fb2944f61d10eb8b995d2ad
parent1179e72704dee8f9f52125496389711ad6cc642c
parent47b79f8a84211c9aafea5b25f1b255438e029cdb
Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop