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

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

62486276ef29fdb47e4e800bdaeb5fc4d697a856