From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 1 Aug 2015 22:09:04 +0000 (-0300)
Subject: Merge branch 'master' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=91938704f802cc108de2e80142b9478016ed67ed;p=puppet-backup.git

Merge branch 'master' into develop
---

91938704f802cc108de2e80142b9478016ed67ed