From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 23 Jul 2013 06:21:33 +0000 (-0700)
Subject: Merge branch 'next' of github.com:ceph/ceph into next
X-Git-Tag: v0.67-rc2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98816e696bdf219c127d4e43755f70e00abdc34f;p=ceph.git

Merge branch 'next' of github.com:ceph/ceph into next
---

98816e696bdf219c127d4e43755f70e00abdc34f