From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 21 Nov 2013 02:38:59 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.74~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b493178f6c24ffd461d1f18ba3041cebb34f7529;p=ceph.git

Merge branch 'next'
---

b493178f6c24ffd461d1f18ba3041cebb34f7529