From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 10 Jul 2013 20:27:58 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.67-rc1~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5deeb7b0c52d656c128880263e21caafa41b71cd;p=ceph.git

Merge branch 'next'
---

5deeb7b0c52d656c128880263e21caafa41b71cd