]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSamuel Just <sam.just@inktank.com>
Mon, 18 Nov 2013 20:59:04 +0000 (12:59 -0800)
committerSamuel Just <sam.just@inktank.com>
Mon, 18 Nov 2013 20:59:04 +0000 (12:59 -0800)

Trivial merge