From: Gary Lowell <gary.lowell@inktank.com>
Date: Wed, 18 Sep 2013 09:11:02 +0000 (+0000)
Subject: Merge branch 'next'
X-Git-Tag: v0.71~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33671f3554ef04d854d763f2ba3b91ac30bc9db8;p=ceph.git

Merge branch 'next'
---

33671f3554ef04d854d763f2ba3b91ac30bc9db8