]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip_4113'
authorSamuel Just <sam.just@inktank.com>
Thu, 14 Feb 2013 00:25:26 +0000 (16:25 -0800)
committerSamuel Just <sam.just@inktank.com>
Thu, 14 Feb 2013 00:25:32 +0000 (16:25 -0800)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge