]> git.deb.at Git - deb/packages.git/commitdiff
Merge commit 'alioth/master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Tue, 27 Oct 2009 21:53:33 +0000 (22:53 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Tue, 27 Oct 2009 21:53:33 +0000 (22:53 +0100)
Conflicts:
conf/apache.conf.sed.in
static/index.tmpl
templates/config.tmpl


No differences found