Merge branch 'experimental' of git://github.com/Dieterbe/uzbl
authorRobert Manea <gotmor@gmail.com>
Fri, 8 May 2009 16:50:43 +0000 (18:50 +0200)
committerRobert Manea <gotmor@gmail.com>
Fri, 8 May 2009 16:50:43 +0000 (18:50 +0200)
commitaea6a23141e5ab6efb9288201017427da3d2f7ef
treec0a0285e812e7a54a430dc7025883779133a1713
parentc0ba28cb2c4f667bf80c0417e651a086caa1201c
parent3900127bbed6f1e99e279466a363a6f89803fdd5
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl

Conflicts:
examples/configs/sampleconfig-dev