]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Merge remote branch 'riseup/master'
authorintrigeri <intrigeri@boum.org>
Sat, 11 Dec 2010 08:39:27 +0000 (09:39 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 11 Dec 2010 08:39:27 +0000 (09:39 +0100)

Trivial merge