Merge branch 'dieter/experimental' into experimental
authorBarrucadu <mike@barrucadu.co.uk>
Sun, 3 May 2009 16:57:00 +0000 (17:57 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Sun, 3 May 2009 16:57:00 +0000 (17:57 +0100)
commit8b88ac0b6c9623789ae808444d8453bcf7c1326c
tree855dbeffe030ca7b210c02fa9b93d00d30d17cd7
parent8f9c1fbc0aa1cf4f848c859573b71390b058f5af
parent070aab904c4da8d64fbb02b5a2bdc79750fb16d6
Merge branch 'dieter/experimental' into experimental

Conflicts:
examples/configs/sampleconfig
examples/configs/sampleconfig-dev
uzbl.c
uzbl.c