From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 30 Oct 2013 16:58:10 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.94.10~27^2^2~364^2~497
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b77a7785f2db2a5671b1d712eed63a772f20270d;p=ceph.git

Merge branch 'next'
---

b77a7785f2db2a5671b1d712eed63a772f20270d