From: Sage Weil <sage@inktank.com>
Date: Tue, 22 Oct 2013 17:45:27 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.73~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=31a94922a9ada132bea06be308484ead84e4d879;p=ceph.git

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

31a94922a9ada132bea06be308484ead84e4d879