]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Wed, 14 Aug 2013 01:59:06 +0000 (18:59 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Wed, 14 Aug 2013 01:59:06 +0000 (18:59 -0700)

Trivial merge