From: Samuel Just <sam.just@inktank.com>
Date: Wed, 13 Aug 2014 21:11:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/next'
X-Git-Tag: v0.85~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f6956b3f4e566c7f31490d3de76655cfd4cc7a9;p=ceph.git

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

0f6956b3f4e566c7f31490d3de76655cfd4cc7a9