]> gitweb.fluxo.info Git - puppet-backupninja.git/commitdiff
Merge branch 'merge_mayfirst' into 'master'
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Tue, 17 Mar 2015 15:24:46 +0000 (15:24 +0000)
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Tue, 17 Mar 2015 15:24:46 +0000 (15:24 +0000)
Merge mayfirst

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

See merge request !1


Trivial merge