]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Merge branch 'master' into 'master'
authorintrigeri <intrigeri@boum.org>
Sat, 28 Feb 2015 12:34:54 +0000 (12:34 +0000)
committerintrigeri <intrigeri@boum.org>
Sat, 28 Feb 2015 12:34:54 +0000 (12:34 +0000)
Merge with cmaisonnneuve and immerda

See merge request !4


Trivial merge