Merge branch 'config-refactor' into experimental
commit24c2b3186c7cd1ad2f451500caa6c7d94fbc144d
authorDieter Plaetinck <dieter@plaetinck.be>
Sat, 16 May 2009 08:02:54 +0000 (16 10:02 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Sat, 16 May 2009 08:02:54 +0000 (16 10:02 +0200)
tree651d1ac8e27be62ac0e63308c490467673eef2f2
parente327c8daddc661cb4d95b6beff89f1849191e692
parent262ccb5f3e120f1d48a63dc46ad7e7689a46ad83
Merge branch 'config-refactor' into experimental
uzbl.c