From: Sage Weil <sage@inktank.com>
Date: Fri, 2 Aug 2013 18:54:53 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.68~113
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9797986697622217cb03b3420a70a49eddb6b02d;p=ceph.git

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

9797986697622217cb03b3420a70a49eddb6b02d