Merge commit 'robm/master' into experimental
authorDequis <dx@dxzone.com.ar>
Wed, 24 Jun 2009 17:14:39 +0000 (14:14 -0300)
committerDequis <dx@dxzone.com.ar>
Wed, 24 Jun 2009 17:14:39 +0000 (14:14 -0300)
1  2 
uzbl.c

diff --cc uzbl.c
Simple merge