From: Sage Weil <sage@newdream.net>
Date: Thu, 3 May 2012 19:16:55 +0000 (-0700)
Subject: Merge branch 'wip-doc-rebase-2'
X-Git-Tag: v0.47~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e7dc441ffad619ea548b83b4a5ab1efc3796045;p=ceph.git

Merge branch 'wip-doc-rebase-2'
---

1e7dc441ffad619ea548b83b4a5ab1efc3796045