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

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

a35ab949fd8e6e2e259076d76d0d41742f045398