From: Sage Weil <sage@inktank.com>
Date: Sat, 7 Sep 2013 21:11:00 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.71~162
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2caa799d693ca1a963667ed003cb6c670cc586d;p=ceph.git

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

b2caa799d693ca1a963667ed003cb6c670cc586d