From: Sage Weil <sage@inktank.com>
Date: Fri, 8 Feb 2013 06:19:58 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.58~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3ba46d31fa714250e0117451494c60221d9dc1a;p=ceph.git

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

f3ba46d31fa714250e0117451494c60221d9dc1a