]> git.deb.at Git - deb/packages.git/commit
Merge commit 'alioth/master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 12 Apr 2009 23:14:32 +0000 (01:14 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 12 Apr 2009 23:14:32 +0000 (01:14 +0200)
commit7484a3adc951c00fd18c530bb88007b5d4632808
tree5baf2857b44fdd1152daee90205b8b232250c6e9
parent426806714669eb8be697d1f2c1b37e5a820e8647
parentdf6116203c901f5f4ba071535389bd57eab2ce21
Merge commit 'alioth/master' into ubuntu-master

Conflicts:
cron.d/100syncarchive_debports
templates/config.tmpl
templates/config/mirrors.tmpl
bin/parse-contents
templates/config.tmpl
templates/html/download.tmpl
templates/html/foot.tmpl