]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Merge branch 'master' of labs.riseup.net:shared-apt into nadir_master
authorvarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 11:24:58 +0000 (13:24 +0200)
committervarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 11:24:58 +0000 (13:24 +0200)

Trivial merge