From: Josh Durgin <jdurgin@redhat.com>
Date: Fri, 16 Jan 2015 22:40:27 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v0.93~267
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a76e537630cf7c298a731e55a81ec30062fed372;p=ceph.git

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

a76e537630cf7c298a731e55a81ec30062fed372