]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Merge branch 'nadir_lenny' into nadir_master nadir
authorvarac <varacanero@zeromail.org>
Tue, 30 Apr 2013 06:37:21 +0000 (08:37 +0200)
committervarac <varacanero@zeromail.org>
Tue, 30 Apr 2013 06:37:21 +0000 (08:37 +0200)

Trivial merge