From: John Wilkins <john.wilkins@inktank.com>
Date: Thu, 9 Jan 2014 18:15:41 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.77~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70cf8d6c971ce3d0fbd45e13a186e60f1603e4bd;p=ceph.git

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

70cf8d6c971ce3d0fbd45e13a186e60f1603e4bd