]> git.deb.at Git - deb/packages.git/commitdiff
Merge branch 'master' into debian-master
authorGerfried Fuchs <rhonda@debian.at>
Tue, 9 Nov 2010 19:36:39 +0000 (20:36 +0100)
committerGerfried Fuchs <rhonda@debian.at>
Tue, 9 Nov 2010 19:36:39 +0000 (20:36 +0100)
1  2 
templates/config.tmpl

Simple merge