]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Tue, 5 Aug 2008 21:09:28 +0000 (18:09 -0300)
committerFrank Lichtenheld <frank@lichtenheld.de>
Tue, 5 Aug 2008 21:09:28 +0000 (18:09 -0300)
commit90b972730bae671e726706892b471e0ce0ac097a
treebc2960dbb4385ee5db2498fcbc3f32cc41f60bf8
parent792f3487bec081187341d8bd5f75d1c62bfd54f3
parentc8f25b919183b1416bc717c59ab8b0d7de6c9374
Merge branch 'master' into ubuntu-master

Conflicts:

templates/html/foot.tmpl
templates/config.tmpl
templates/html/foot.tmpl