From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 23 Jul 2013 06:23:34 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.68~134
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e734ffeae66edfca285ec447c31b871d8464478;p=ceph.git

Merge branch 'next'
---

9e734ffeae66edfca285ec447c31b871d8464478