Merge branch 'helmut' into helmutexp
authorHelmut Grohne <helmut@subdivi.de>
Wed, 29 Jul 2009 20:14:26 +0000 (22:14 +0200)
committerHelmut Grohne <helmut@subdivi.de>
Wed, 29 Jul 2009 20:14:26 +0000 (22:14 +0200)
commit7bd6fa298bbe8d31bfb7a683fe531c2c562b55db
tree47e90f68f5af3a695f522147fab15bc87b40dbca
parentf1a8ebafabd272faac776fcd6ceea8d1db8d1e5e
parentf5423bfe2855f4aeccfcf38dad6840160ebe96ad
Merge branch 'helmut' into helmutexp

Conflicts:
uzbl.c
uzbl.c
uzbl.h