]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Merge remote branch 'riseup/master'
authorintrigeri <intrigeri@boum.org>
Wed, 15 Dec 2010 21:01:34 +0000 (22:01 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 15 Dec 2010 21:01:34 +0000 (22:01 +0100)

Trivial merge