]> git.deb.at Git - deb/packages.git/commit
Merge commit 'alioth/master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 15 Mar 2009 18:49:58 +0000 (19:49 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 15 Mar 2009 18:49:58 +0000 (19:49 +0100)
commit1fbeeb0e19b44543525a8a36e7d5a1b5d386c4ec
tree3eacf92d67785e9efe0e67b8c7a00cb2f8e3b9a6
parent6c216987d1e3085640d6ce511b35d68ea5adc84f
parentd4847b84cec9655e66d5faf9e9078c86bec11ecd
Merge commit 'alioth/master' into debian-master

Conflicts:
templates/config.tmpl
config.sh.sed.in
templates/config.tmpl