]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Mon, 20 May 2013 19:22:29 +0000 (12:22 -0700)
committerSage Weil <sage@inktank.com>
Mon, 20 May 2013 19:22:29 +0000 (12:22 -0700)

Trivial merge