Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into dieter/experimental
authordusanx <ef_dva@yahoo.com>
Mon, 27 Apr 2009 22:17:39 +0000 (00:17 +0200)
committerdusanx <ef_dva@yahoo.com>
Mon, 27 Apr 2009 22:17:39 +0000 (00:17 +0200)
Conflicts:
uzbl.c

1  2 
uzbl.c

diff --cc uzbl.c
Simple merge