Merge branch 'dus/master' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Sat, 2 May 2009 15:04:00 +0000 (17:04 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Sat, 2 May 2009 15:04:00 +0000 (17:04 +0200)
1  2 
uzbl.c

diff --cc uzbl.c
Simple merge