projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fc210d 7b790a6)
Merge branch 'devel-2.4' into devel-2.5
authorRené Nussbaumer <rn@google.com>
Thu, 27 Oct 2011 13:28:02 +0000 (15:28 +0200)
committerRené Nussbaumer <rn@google.com>
Thu, 27 Oct 2011 13:33:53 +0000 (15:33 +0200)
Conflicts:
configure.ac (trivial)

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

1  2 
NEWS patch | diff1 | diff2 | blob | history

diff --cc NEWS
Simple merge
Unnamed repository; edit this file 'description' to name the repository.