From: John Wilkins <john.wilkins@inktank.com>
Date: Thu, 9 May 2013 19:09:00 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.63~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=827fd108b64cd8b3fb0fa7a1cbf184529bdf4d7f;p=ceph.git

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

827fd108b64cd8b3fb0fa7a1cbf184529bdf4d7f