]> git.deb.at Git - deb/packages.git/commitdiff
Merge branch 'master' into archive-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 5 Jul 2009 22:16:40 +0000 (00:16 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 5 Jul 2009 22:16:40 +0000 (00:16 +0200)
Conflicts:
static/index.tmpl
templates/config.tmpl


No differences found