From: Sage Weil <sage@inktank.com>
Date: Mon, 23 Dec 2013 17:28:29 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.75~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fd60ac29bbf747725d00d4036d9f4337a4f8bb5;p=ceph.git

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

4fd60ac29bbf747725d00d4036d9f4337a4f8bb5