]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Merge branch 'master' of git://labs.riseup.net/shared-apt
authorroot <root@puppet.nadir.org>
Wed, 16 Feb 2011 13:23:54 +0000 (13:23 +0000)
committerroot <root@puppet.nadir.org>
Wed, 16 Feb 2011 13:23:54 +0000 (13:23 +0000)

Trivial merge