]> err.no Git - dak/commit
Merge branch 'master' of /srv/ftp.debian.org/git/dak
authorPhilipp Kern <pkern@debian.org>
Sat, 13 Sep 2008 14:40:02 +0000 (14:40 +0000)
committerPhilipp Kern <pkern@debian.org>
Sat, 13 Sep 2008 14:40:02 +0000 (14:40 +0000)
commitbdc67f9ca8905fe83d7c2c8c1dd7a41bcd1801ce
treefcc299161c78ea2e424a48495006cf5c54fdaade
parenta6dbdaaf2281e70a1ccf28af8b673ab9db2a7574
parentf483192cca8c19dd46a73c469888ac440fbadb9d
Merge branch 'master' of /srv/ftp.debian.org/git/dak

Conflicts:

ChangeLog
ChangeLog