]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage.weil@dreamhost.com>
Wed, 6 Jul 2011 20:49:14 +0000 (13:49 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 6 Jul 2011 20:49:14 +0000 (13:49 -0700)

Trivial merge