Merge commit 'duc/experimental' into experimental
authorBarrucadu <mike@barrucadu.co.uk>
Tue, 19 May 2009 11:12:36 +0000 (12:12 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Tue, 19 May 2009 11:12:36 +0000 (12:12 +0100)
commit87912a756633806cc8fb1d1b19a41109fe4fb86a
tree67e03d553459fb14049329e901bc29707b78084c
parent6eb4c0d4a196dc52e950474afc6fc79341b95960
parentd228014222c889eb61150a5aa9b2efaf5259b880
Merge commit 'duc/experimental' into experimental

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