Merge commit 'any/master' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Fri, 1 May 2009 18:08:41 +0000 (20:08 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Fri, 1 May 2009 18:08:41 +0000 (20:08 +0200)
commit565e598c0e692283faeece6db596f9e12c55df56
treeac341698fcf7e26e0cc16f05ddc4daee1e637003
parent69c69e9ee76e8fdc973de03debb6d9a4aa053b7a
parentce28fc1243418617ab07544b6dc774693130da92
Merge commit 'any/master' into experimental
examples/configs/sampleconfig
examples/configs/sampleconfig-dev
uzbl.c