From: Sage Weil <sage@inktank.com>
Date: Fri, 10 Jan 2014 21:57:04 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.77~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ddf5893b44ad80f9c1bc7a58b1bab9189622e78;p=ceph.git

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

1ddf5893b44ad80f9c1bc7a58b1bab9189622e78