Merge branch 'master' of git://git.pld-linux.org/packages/ceph
authorJakub Bogusz <qboosh@pld-linux.org>
Mon, 1 Apr 2013 14:32:44 +0000 (16:32 +0200)
committerJakub Bogusz <qboosh@pld-linux.org>
Mon, 1 Apr 2013 14:32:44 +0000 (16:32 +0200)
commita9b47b68fc4a1a5370a876041b32a25baf2f8ba4
treeb483e663f9f117c50577a04c52a92b833310278c
parentc1654e297eeb6b8d6c86f16a9889c9bcf31639e7
parent46e291f3e57dcb09e2dca4f7f1dd7c2a67750153
Merge branch 'master' of git://git.pld-linux.org/packages/ceph

Conflicts:
ceph.spec
This page took 0.096716 seconds and 4 git commands to generate.