From: John Wilkins <john.wilkins@inktank.com>
Date: Wed, 7 Nov 2012 22:03:34 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.55~182
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=764ec3650f1ecd98fd2397a56c9e1c4f0f5006cd;p=ceph.git

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

764ec3650f1ecd98fd2397a56c9e1c4f0f5006cd