From: David Zafman <david.zafman@inktank.com>
Date: Tue, 14 May 2013 23:38:50 +0000 (-0700)
Subject: Merge branch 'wip-5049'
X-Git-Tag: v0.64~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=624c8cc30fb7310648d4e0b2ddd3a27b6e7f7634;p=ceph.git

Merge branch 'wip-5049'

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

624c8cc30fb7310648d4e0b2ddd3a27b6e7f7634