From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 5 Mar 2013 17:06:24 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.59~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af6b6eddae073315c70bba4712511125360a0aad;p=ceph.git

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

af6b6eddae073315c70bba4712511125360a0aad