]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
merge with immerda master
authornadir <nadir-technik@nadir.org>
Sat, 9 Oct 2010 09:49:05 +0000 (11:49 +0200)
committernadir <nadir-technik@nadir.org>
Sat, 9 Oct 2010 09:49:05 +0000 (11:49 +0200)
1  2 
README

diff --cc README
Simple merge