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)
Conflicts:
examples/configs/sampleconfig-dev


Trivial merge