From: John Wilkins <john.wilkins@inktank.com>
Date: Thu, 9 May 2013 19:49:59 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.63~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c55c6abb6055ff7983dd7b1b7c7903e8b08e23b4;p=ceph.git

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

c55c6abb6055ff7983dd7b1b7c7903e8b08e23b4