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

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

d3d56ee502fa0f278b0c503cccbf7aa7d5d3d35c