]> git.deb.at Git - deb/packages.git/commit
Merge commit 'alioth/master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 9 Dec 2007 18:26:46 +0000 (19:26 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 9 Dec 2007 18:26:46 +0000 (19:26 +0100)
commit8290599bd43de836a8a02b547a1b1b41f9f25871
treeac275da32ff6d52fe79331f888143d7302ef50e0
parenta6b0139eb597c756080bf39b1708abf10f8e3a22
parentc38147cababd110747a260727ba28a4c4f2463e1
Merge commit 'alioth/master' into debian-master

Conflicts:

config.sh.sed.in
debian/control
lib/Packages/Dispatcher.pm
config.sh.sed.in
debian/control
templates/config.tmpl