From: John Wilkins <john.wilkins@inktank.com>
Date: Mon, 4 Mar 2013 18:59:50 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.59~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0167d2ae7444d0cb054d6c21bec39f1ea779ad45;p=ceph.git

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

0167d2ae7444d0cb054d6c21bec39f1ea779ad45