]> err.no Git - dak/commit
Merge branch 'master' of ftpmaster's dak repository
authorPhilipp Kern <pkern@debian.org>
Sun, 7 Sep 2008 14:33:11 +0000 (14:33 +0000)
committerPhilipp Kern <pkern@debian.org>
Sun, 7 Sep 2008 14:33:11 +0000 (14:33 +0000)
commite79e9a1395528354b5978fc4b92a8fcdd1559d70
treec7f4218bbfa5262794f9020b6a05b5f1bb35df0f
parent95f05e8aac2673dadfef6aed999551d60cb6d322
parent65d232b9594b91d4381d7daf1f1d16684ea03cb6
Merge branch 'master' of ftpmaster's dak repository

Conflicts:

ChangeLog
ChangeLog