From: Samuel Just <sam.just@inktank.com>
Date: Mon, 18 Nov 2013 20:59:04 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.74~84
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2301c04aad9dc816b7f75a290ca5f80796a10eac;p=ceph.git

Merge branch 'next'
---

2301c04aad9dc816b7f75a290ca5f80796a10eac