]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-4064-sam'
authorSamuel Just <sam.just@inktank.com>
Tue, 12 Feb 2013 18:15:26 +0000 (10:15 -0800)
committerSamuel Just <sam.just@inktank.com>
Tue, 12 Feb 2013 18:16:12 +0000 (10:16 -0800)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge