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

Trivial merge