Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop
commit1d4e95f49b61164e091708c669b639e922f7f61d
authorRob McGuire-Dale <rob.mcguiredale+git@gmail.com>
Thu, 9 Jun 2011 22:52:52 +0000 (9 15:52 -0700)
committerRob McGuire-Dale <rob.mcguiredale+git@gmail.com>
Thu, 9 Jun 2011 22:52:52 +0000 (9 15:52 -0700)
treed676b0da2edae10f784d37f5ac73e58524727aee
parent5168037e701f95e0b23f37671c95a5288d07b3d9
parentb02d13318ecadef4feff17588d5199f50b80ea41
Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop