Merge branch 'dieter/experimental' into experimental
authorBarrucadu <mike@barrucadu.co.uk>
Sun, 17 May 2009 10:22:09 +0000 (11:22 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Sun, 17 May 2009 10:22:09 +0000 (11:22 +0100)
commita4fda48c326def44fdf7ec383b34182070c88b74
treef638789a96806ff022671e531190c62939255246
parent468dce126178dc5516431a5e7a3a8b0710a08dad
parent9a2299f79b2fa34b10279b5651d2886e025bda78
Merge branch 'dieter/experimental' into experimental

Conflicts:
uzbl.c
README
uzbl.c