From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 19 Mar 2016 14:22:26 +0000 (-0300)
Subject: Merge remote-tracking branch 'shared/master' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=01e32b5549fad5ec719a8650f5dbfac739e9c2fd;p=puppet-backupninja.git

Merge remote-tracking branch 'shared/master' into develop

Conflicts:
	templates/backupninja.conf.erb
	templates/sh.conf.erb
---

01e32b5549fad5ec719a8650f5dbfac739e9c2fd