From: Samuel Just <sam.just@inktank.com>
Date: Wed, 8 Oct 2014 18:18:13 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/giant'
X-Git-Tag: v0.88~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d3389701b3b634427f1b6464a8d82fc63364d47;p=ceph.git

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

3d3389701b3b634427f1b6464a8d82fc63364d47