From: Sage Weil <sage@inktank.com>
Date: Sun, 28 Jul 2013 23:17:55 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.68~120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee18322e5bcf1ec512d7512e660d319ca390cbd9;p=ceph.git

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

ee18322e5bcf1ec512d7512e660d319ca390cbd9