Merge branch 'dieter/experimental' into experimental
authorBarrucadu <mike@barrucadu.co.uk>
Fri, 1 May 2009 15:29:27 +0000 (16:29 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Fri, 1 May 2009 15:29:27 +0000 (16:29 +0100)
commit772ac45fff0511e0d83949b94a21304e76209507
tree83dd550e9969a6336ec60532519367d839fa1c8e
parent8ba87ad7653bff70bf44106dc1e3fe1d3e99d9f0
parent921b5985eb6c5c82ef68fda58cdfce1f3c2f18ce
Merge branch 'dieter/experimental' into experimental

Conflicts:
uzbl.c
uzbl.c