From: Greg Farnum <greg@inktank.com>
Date: Thu, 14 Feb 2013 19:39:13 +0000 (-0800)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v0.58~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84ef4a899e80af816fe7c7181e63d5ca7a924aa2;p=ceph.git

Merge branch 'master' of github.com:ceph/ceph
---

84ef4a899e80af816fe7c7181e63d5ca7a924aa2