From: Sage Weil <sage@inktank.com>
Date: Fri, 12 Jul 2013 17:16:27 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.67-rc1~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e83a3bea2fea4c2a1dcc4a4fd427542a1c6ae79;p=ceph.git

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

8e83a3bea2fea4c2a1dcc4a4fd427542a1c6ae79