From: intrigeri <intrigeri@boum.org>
Date: Sat, 28 Feb 2015 12:34:54 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=31f8661eea49b05f32ccca4ad3d628548ba54b77;p=puppet-apt.git

Merge branch 'master' into 'master'

Merge with cmaisonnneuve and immerda

See merge request !4
---

31f8661eea49b05f32ccca4ad3d628548ba54b77