From: John Spray <jspray@redhat.com>
Date: Wed, 17 Sep 2014 12:50:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/giant'
X-Git-Tag: v0.94.10~27^2^2~309
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65a4141e22dbf77d0557ea63e9ed25634e669557;p=ceph.git

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

65a4141e22dbf77d0557ea63e9ed25634e669557