From: John Wilkins <john.wilkins@inktank.com>
Date: Fri, 22 Nov 2013 23:16:18 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.74~75
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8ccb91fd365782a7d9d60eff4723e25b2bcc292;p=ceph.git

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

e8ccb91fd365782a7d9d60eff4723e25b2bcc292