]> err.no Git - dak/commitdiff
Merge branch 'master' into security
authorJoerg Jaspert <joerg@debian.org>
Sat, 1 Nov 2008 19:47:37 +0000 (20:47 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sat, 1 Nov 2008 19:47:37 +0000 (20:47 +0100)
* master:
  defaultsuite stuff

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge