From: Josh Durgin <josh.durgin@inktank.com>
Date: Mon, 27 Jan 2014 22:57:06 +0000 (-0800)
Subject: Merge pull request #1080 from onlyjob/master
X-Git-Tag: v0.78~268
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=120b3fbf9095d4216e3a70893003f3f2faa07d38;p=ceph.git

Merge pull request #1080 from onlyjob/master

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

120b3fbf9095d4216e3a70893003f3f2faa07d38