From: Gary Lowell <gary.lowell@inktank.com>
Date: Wed, 1 Jan 2014 07:53:37 +0000 (+0000)
Subject: Merge branch 'next'
X-Git-Tag: v0.75~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe3fd5fb4aa6327256dfaf731914dc4f79b0d44e;p=ceph.git

Merge branch 'next'
---

fe3fd5fb4aa6327256dfaf731914dc4f79b0d44e