Merge branch 'master' of git://git.puppet.immerda.ch/module-common
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Fri, 20 Feb 2015 20:37:10 +0000 (15:37 -0500)
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Fri, 20 Feb 2015 20:37:10 +0000 (15:37 -0500)

Trivial merge