Merge branch 'experimental' into bf2
authorTom Adams <tom@holizz.com>
Wed, 26 Aug 2009 08:47:46 +0000 (09:47 +0100)
committerTom Adams <tom@holizz.com>
Wed, 26 Aug 2009 08:47:46 +0000 (09:47 +0100)
commit254e4a473fc96b6418c348fcfdf0a49c30b2a035
tree53de5f0110ccffdc040e7d8d6c6c30b8fae6b783
parent36859a3a174387421dd4397f5f14a3f62b0deeed
parent8cfc268b053c0b5a8afc3f6d85c1e31518a6644c
Merge branch 'experimental' into bf2

Conflicts:
examples/config/uzbl/config
examples/config/uzbl/config
uzbl.c
uzbl.h