From: Alfredo Deza <alfredo@deza.pe>
Date: Sat, 19 Sep 2015 11:32:55 +0000 (-0400)
Subject: Merge pull request #358 from trhoden/git-cleanup
X-Git-Tag: v1.5.29~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d725afbf6e0834b3e64fc61c26c9d652dcace204;p=ceph-deploy.git

Merge pull request #358 from trhoden/git-cleanup

vendor from git.ceph.com
---

d725afbf6e0834b3e64fc61c26c9d652dcace204