From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 2 Apr 2013 00:57:45 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.62~112
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ffadce67eeed6630882cdbaf323145fa26ac4ef;p=ceph.git

Merge branch 'next'
---

6ffadce67eeed6630882cdbaf323145fa26ac4ef