]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Thu, 21 Feb 2008 13:51:40 +0000 (14:51 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Thu, 21 Feb 2008 13:51:40 +0000 (14:51 +0100)
commitad2da3295e7442dd59932ec9f3f45a9650869483
tree611e5a3bba7f10348685ccca4584d56db36ac024
parent82bda389256e0a447fdd2e1689b2388a6082c426
parent694cb1687b2502b24c32f1f10b6a227fa484920e
Merge branch 'master' into ubuntu-master

Conflicts:

templates/config.tmpl
conf/apache.conf.sed.in
static/index.tmpl
templates/config.tmpl
templates/html/foot.tmpl
templates/html/head.tmpl