Merge commit 'bar/experimental' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Wed, 20 May 2009 19:30:08 +0000 (21:30 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Wed, 20 May 2009 19:30:08 +0000 (21:30 +0200)
1  2 
uzbl.c

diff --cc uzbl.c
Simple merge