From: John Wilkins <john.wilkins@dreamhost.com>
Date: Tue, 22 May 2012 16:54:06 +0000 (-0700)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v0.48argonaut~110^2~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=884aa8a6616b03cc53e8691bfc73a48fa25db555;p=ceph.git

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

884aa8a6616b03cc53e8691bfc73a48fa25db555