Merge commit 'rob/config-refactor' into config-refactor
commitd4fb9efefafbad25f9ced40fa56feb18e3c0cd0c
authorDieter Plaetinck <dieter@plaetinck.be>
Fri, 15 May 2009 15:56:05 +0000 (15 17:56 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Fri, 15 May 2009 15:56:05 +0000 (15 17:56 +0200)
tree70db7565356bc0a1d632e35ace2adaa1ddcac4a3
parent52a1804fdcd2af3e030a842e6c0e55c53b720e92
parent5d498b3df714fa31230d682456e69938614e6074
Merge commit 'rob/config-refactor' into config-refactor
uzbl.c