]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-5371-next' into next
authorDavid Zafman <david.zafman@inktank.com>
Fri, 12 Jul 2013 21:25:26 +0000 (14:25 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Fri, 12 Jul 2013 21:25:33 +0000 (14:25 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge