]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Merge remote-tracking branch 'shared/master'
authormh <mh@immerda.ch>
Sun, 15 Apr 2012 11:18:59 +0000 (13:18 +0200)
committermh <mh@immerda.ch>
Sun, 15 Apr 2012 11:19:45 +0000 (13:19 +0200)
Conflicts:
README

1  2 
files/squeeze/50unattended-upgrades

Simple merge