From: John Wilkins <john.wilkins@inktank.com>
Date: Fri, 1 Feb 2013 19:31:10 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.57~62
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04210c265270cff286bb1b66d4bdae3484dd94e2;p=ceph.git

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

04210c265270cff286bb1b66d4bdae3484dd94e2