From: Sage Weil <sage@inktank.com>
Date: Wed, 30 Oct 2013 22:35:19 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.74~94
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=280a94b0197d9ebd4b9e01599fff6d417e60bda3;p=ceph.git

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

280a94b0197d9ebd4b9e01599fff6d417e60bda3