From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 17 Mar 2015 15:24:46 +0000 (+0000)
Subject: Merge branch 'merge_mayfirst' into 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a9e4f0b5a75796c56c5cfedc8c0bffc0c386e3bc;p=puppet-backupninja.git

Merge branch 'merge_mayfirst' into 'master'

Merge mayfirst

(almost) Last branch that needs to be merged in. This work is 3 years old

See merge request !1
---

a9e4f0b5a75796c56c5cfedc8c0bffc0c386e3bc