]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Mon, 7 Jan 2013 21:12:33 +0000 (13:12 -0800)
committerSage Weil <sage@inktank.com>
Mon, 7 Jan 2013 21:12:33 +0000 (13:12 -0800)

Trivial merge