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

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

913a205c97858afc90617a3ef6097a9f0f2eaec7