From: Josh Durgin <josh.durgin@inktank.com>
Date: Mon, 26 Aug 2013 00:12:42 +0000 (-0700)
Subject: Merge branch 'sleinen'
X-Git-Tag: v0.69~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2184ec135076456cad9dee7724d31c158edcfcf2;p=ceph.git

Merge branch 'sleinen'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

2184ec135076456cad9dee7724d31c158edcfcf2