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

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

68c1c70e1fdec7a916272695f2dcc27b0b65e9fc