From: John Wilkins <john.wilkins@inktank.com>
Date: Wed, 21 Aug 2013 18:02:26 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.69~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5a877867adb857da57e5bf267d6f9b6c2b8357d;p=ceph.git

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

d5a877867adb857da57e5bf267d6f9b6c2b8357d