Merge commit 'dieterbe/experimental' into experimental
authorDequis <dx@dxzone.com.ar>
Mon, 22 Jun 2009 19:51:11 +0000 (16:51 -0300)
committerDequis <dx@dxzone.com.ar>
Mon, 22 Jun 2009 19:51:11 +0000 (16:51 -0300)
1  2 
uzbl.c

diff --cc uzbl.c
Simple merge