From: John Wilkins <john.wilkins@inktank.com>
Date: Sat, 3 Nov 2012 19:12:24 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.55~130^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f67e79a2fc3ad9ce2bb4797dabe586eabbe109af;p=ceph.git

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

f67e79a2fc3ad9ce2bb4797dabe586eabbe109af