From: Sage Weil <sage@inktank.com>
Date: Wed, 24 Jul 2013 04:41:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.68~130
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=139f25f0dd54237ec7c4fbb314b2d2d2276a66c9;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

139f25f0dd54237ec7c4fbb314b2d2d2276a66c9