]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Tue, 19 Aug 2008 22:00:43 +0000 (00:00 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Tue, 19 Aug 2008 22:00:43 +0000 (00:00 +0200)
commit0b5667823629cdb055a2fe44fd16a9ff2ddae306
tree56861f3b83938ad03a09fba71c9da3ff02c26560
parent90b972730bae671e726706892b471e0ce0ac097a
parentcd80f50e4bba8ac28df7b3185ae94ce12520e2f2
Merge branch 'master' into ubuntu-master

Conflicts:

config.sh.sed.in
static/packages.css.sed.in