]> git.deb.at Git - deb/packages.git/commit
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)
commitf13529a2f31d2dd523c2a5559f62c73129e3954d
tree994d539341ca0994312c4e7d6db9ff18d7fd7358
parent20687302e54e781d7f675f227ba6441df1be79dc
parentdc95de76e0fec5f24c66de1bd743c6a5333dc5c3
Merge commit 'alioth/master' into debian-master

Conflicts:
conf/apache.conf.sed.in
static/index.tmpl
templates/config.tmpl
conf/apache.conf.sed.in
templates/config.tmpl