Merge branch 't/unconditional_hooks'
authorAndre Noll <maan@systemlinux.org>
Wed, 12 May 2010 09:04:36 +0000 (11:04 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 12 May 2010 09:04:36 +0000 (11:04 +0200)
1  2 
dss.c

diff --cc dss.c
Simple merge