From: John Wilkins <john.wilkins@inktank.com>
Date: Tue, 9 Jul 2013 01:11:57 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.67-rc1~138
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1b4398dd2cef746a69e22b8aa23a9cb7f4afbef;p=ceph.git

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

f1b4398dd2cef746a69e22b8aa23a9cb7f4afbef