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

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

bf9c9d0f38edbe7ac99df48ac8304b130d57d426