commit a9b47b68fc4a1a5370a876041b32a25baf2f8ba4
Merge: c1654e2 46e291f
Author: Jakub Bogusz <[email protected]>
Date: Mon Apr 1 16:32:44 2013 +0200
Merge branch 'master' of git://git.pld-linux.org/packages/ceph
Conflicts:
ceph.spec
---
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/a9b47b68fc4a1a5370a876041b32a25baf2f8ba4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
