From: Samuel Just <sjust@redhat.com>
Date: Mon, 2 Feb 2015 22:18:52 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/next'
X-Git-Tag: v0.93~125
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f9f4e536e1c937700287a5b311567b62a087207;p=ceph.git

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

0f9f4e536e1c937700287a5b311567b62a087207