From: Peter Reiher <reiher@inktank.com>
Date: Fri, 26 Oct 2012 22:32:48 +0000 (-0700)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v0.55~130^2~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b258764bc2375018be60886dd996fba61173d4d;p=ceph.git

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

1b258764bc2375018be60886dd996fba61173d4d