Merge branch 'master' of git://git.puppet.immerda.ch/module-user
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Wed, 3 Jun 2015 19:46:47 +0000 (15:46 -0400)
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Wed, 3 Jun 2015 19:46:47 +0000 (15:46 -0400)

Trivial merge