From: David Zafman <david.zafman@inktank.com>
Date: Fri, 12 Jul 2013 21:25:26 +0000 (-0700)
Subject: Merge branch 'wip-5371-next' into next
X-Git-Tag: v0.67-rc1~59^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f67e437b03fe68661ec7537e541ebe15463ccf4d;p=ceph.git

Merge branch 'wip-5371-next' into next

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

f67e437b03fe68661ec7537e541ebe15463ccf4d