Merge commit 'duc/experimental' into config-refactor
commitf0860645c138196fc1a71d8c36aff0f99bdfb7f5
authorDieter Plaetinck <dieter@plaetinck.be>
Fri, 15 May 2009 15:57:29 +0000 (15 17:57 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Fri, 15 May 2009 15:57:29 +0000 (15 17:57 +0200)
treec9df6ef77908dfc6c68d386e7a7c9c8728e81b96
parentd4fb9efefafbad25f9ced40fa56feb18e3c0cd0c
parent1cee2c9fd589bcefea2ba142148409a7e21ed789
Merge commit 'duc/experimental' into config-refactor
uzbl.c