From: Sage Weil <sage@inktank.com>
Date: Tue, 29 Jan 2013 02:15:35 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.57~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87d85fa2630afdf24139bd574d2c8607a3675170;p=ceph.git

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

87d85fa2630afdf24139bd574d2c8607a3675170