From: John Wilkins <john.wilkins@inktank.com>
Date: Wed, 3 Jul 2013 22:27:26 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.67-rc1~153
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e960e1bb6a952cd3576487b742c5314810e23048;p=ceph.git

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

e960e1bb6a952cd3576487b742c5314810e23048