From: John Wilkins <john.wilkins@inktank.com>
Date: Tue, 18 Jun 2013 21:27:16 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.66~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c819dcc26e02c63255cca25348ce2a245a636635;p=ceph.git

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

c819dcc26e02c63255cca25348ce2a245a636635