From: John Wilkins <john.wilkins@inktank.com>
Date: Fri, 26 Oct 2012 21:49:00 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.55~196
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=31284f74fec4928dfb671182673d4443aba2f2fc;p=ceph.git

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

31284f74fec4928dfb671182673d4443aba2f2fc