]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of https://github.com/ceph/ceph
authorWido den Hollander <wido@42on.com>
Mon, 11 Nov 2013 08:38:18 +0000 (09:38 +0100)
committerWido den Hollander <wido@42on.com>
Mon, 11 Nov 2013 08:38:18 +0000 (09:38 +0100)

Trivial merge