From: Gary Lowell <gary.lowell@inktank.com>
Date: Wed, 14 Aug 2013 01:59:06 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.68~81
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ff6901141c9dc89ca93d749989f556aaedc65b4;p=ceph.git

Merge branch 'next'
---

8ff6901141c9dc89ca93d749989f556aaedc65b4