]> git.deb.at Git - deb/packages.git/commit
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)
commit6a99f4714326a371636fae11a2613160a32d8c8f
treef1c5e530ae8b854bb87478482d1ed6773aeec50f
parent1e0b8833ffc8fa00e781ee09072599f18599a004
parent02bdaff0b3a148bf4ebe3687125fb981d194e8ba
Merge branch 'master' into archive-master

Conflicts:
static/index.tmpl
templates/config.tmpl
conf/apache.conf.sed.in
lib/Packages/Dispatcher.pm
lib/Packages/DoIndex.pm
templates/html/homepage.tmpl