| commit | 781268e0eb12438cf3df0f6e7dd63ef2bf4ea516 | |
| author | Peter Krenesky <peter@osuosl.org> | |
| Fri, 22 Apr 2011 01:30:31 +0000 (21 18:30 -0700) | ||
| committer | Peter Krenesky <peter@osuosl.org> | |
| Fri, 22 Apr 2011 01:30:31 +0000 (21 18:30 -0700) | ||
| tree | e54baa85f67c0db32ac48a2a49d184396078d06a | treesnapshot (tar.gz zip) |
| parent | 466f15e718193f4ab6f51156678f4aaa9f21503a | commitdiff |
| parent | 8cc9f1e472cf8bb9517eeff0d97ef425ec9b2343 | commitdiff |
Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop
Conflicts:
CHANGELOG
Conflicts:
CHANGELOG