]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Tue, 4 Dec 2012 05:29:52 +0000 (21:29 -0800)
committerGary Lowell <gary.lowell@inktank.com>
Tue, 4 Dec 2012 05:29:52 +0000 (21:29 -0800)

Trivial merge