From: Sage Weil <sage@inktank.com>
Date: Sat, 24 Aug 2013 21:12:44 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.69~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b1b74598bae0e13691e6244c647fb89cc9e21a7;p=ceph.git

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

8b1b74598bae0e13691e6244c647fb89cc9e21a7