From: Wido den Hollander <wido@42on.com>
Date: Fri, 15 Nov 2013 11:46:04 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.74~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6d20ceedb18105b41f92a6a8211cffb0234fcaf;p=ceph.git

Merge branch 'master' of https://github.com/ceph/ceph
---

f6d20ceedb18105b41f92a6a8211cffb0234fcaf