]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorDan Mick <dan.mick@inktank.com>
Wed, 26 Jun 2013 19:39:15 +0000 (12:39 -0700)
committerDan Mick <dan.mick@inktank.com>
Wed, 26 Jun 2013 19:39:15 +0000 (12:39 -0700)

Trivial merge