]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/next'
authorJohn Spray <jspray@redhat.com>
Thu, 14 Aug 2014 13:44:06 +0000 (14:44 +0100)
committerJohn Spray <jspray@redhat.com>
Thu, 14 Aug 2014 13:44:06 +0000 (14:44 +0100)

Trivial merge