]> err.no Git - dak/commit
Merge commit 'mhy/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 19:11:03 +0000 (20:11 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 19:11:03 +0000 (20:11 +0100)
commit7f657044d34e2e5daf301c346ef5d83a47ce00fa
tree873ad6b4046fd7a47bc45907e84bce7d8e63205e
parent4738324786900511b635f388a76a5d755edf0fb4
parentd719cb0e67cdacd21f2ed20e38ed44e910751542
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  really disable contents in p-a

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