From: Gary Lowell <gary.lowell@inktank.com>
Date: Fri, 19 Jul 2013 22:30:19 +0000 (-0700)
Subject: Merge branch 'wip-5300'
X-Git-Tag: v1.2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c7d914fb1d578827c2593dea0b076646683e9d5;p=ceph-deploy.git

Merge branch 'wip-5300'
---

3c7d914fb1d578827c2593dea0b076646683e9d5