Merge branch 'helmut' into helmutexp
authorHelmut Grohne <helmut@subdivi.de>
Wed, 29 Jul 2009 20:46:14 +0000 (22:46 +0200)
committerHelmut Grohne <helmut@subdivi.de>
Wed, 29 Jul 2009 20:46:14 +0000 (22:46 +0200)
1  2 
uzbl.c

diff --cc uzbl.c
Simple merge