]> err.no Git - dak/commit
Merge commit 'tomv_w/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Tue, 7 Oct 2008 20:51:48 +0000 (22:51 +0200)
committerJoerg Jaspert <joerg@debian.org>
Tue, 7 Oct 2008 20:51:48 +0000 (22:51 +0200)
commit2c92f33b772a51832d558bb8ab9112b35476c7fa
tree326581c80ca754cd719e48ead490ef3ed5e2d8c6
parentf2a07f389ced773e2c2e97cc2075df3cf0f4ac43
parent7bdfbd9168d7859c3eca593a8d6441a2a3691976
Merge commit 'tomv_w/master' into merge

* commit 'tomv_w/master':
  config for show-deferred
  whitespace sanitizing

Signed-off-by: Joerg Jaspert <joerg@debian.org>