From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 19 Feb 2013 22:55:14 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.58~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0424ebced7898e942b7465e99098091c474cbfb;p=ceph.git

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

d0424ebced7898e942b7465e99098091c474cbfb