Merge branch 'dieter/experimental' into experimental
authorBarrucadu <mike@barrucadu.co.uk>
Mon, 18 May 2009 21:01:30 +0000 (22:01 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Mon, 18 May 2009 21:01:30 +0000 (22:01 +0100)
commit992230601106aadf0146cb022cd240136ae2f261
tree97ddf5a50943ddc5deb28e4beaea56dbb9ee68e0
parent7e301b27e4e61e0c1bd1bc40f1008608969033e6
parent30131ffa360fc398e8b6393159f992f1adf89af1
Merge branch 'dieter/experimental' into experimental

Conflicts:
uzbl.c
uzbl.h
README
uzbl.c
uzbl.h