From: John Wilkins <john.wilkins@inktank.com>
Date: Wed, 10 Oct 2012 22:16:17 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.54~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29bd47676245a60b16d4f1a40cb3a3a25445d00b;p=ceph.git

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

29bd47676245a60b16d4f1a40cb3a3a25445d00b