From: David Zafman <david.zafman@inktank.com>
Date: Fri, 10 May 2013 23:44:19 +0000 (-0700)
Subject: Merge branch 'wip-4273'
X-Git-Tag: v0.63~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea0e0c7e34f6b99ecb123d0ee761f653e7e6bc04;p=ceph.git

Merge branch 'wip-4273'

Reviewed-by: Sam Just <sam.just@inktank.com>
---

ea0e0c7e34f6b99ecb123d0ee761f653e7e6bc04