]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/giant'
authorJohn Spray <jspray@redhat.com>
Wed, 17 Sep 2014 12:50:55 +0000 (13:50 +0100)
committerJohn Spray <jspray@redhat.com>
Wed, 17 Sep 2014 12:50:55 +0000 (13:50 +0100)

Trivial merge