Merge commit 'rob/config-refactor' into experimental
authorDuClare <akarinotengoku@gmail.com>
Thu, 14 May 2009 10:47:37 +0000 (13:47 +0300)
committerDuClare <akarinotengoku@gmail.com>
Thu, 14 May 2009 10:47:37 +0000 (13:47 +0300)
commit06bac23ac505d5ba2b1fac23ede9c4c7e8c8518c
treea75ece775567468a9e4f816397f009f0eeb308d5
parent3805fe89296634aea7634cb92e4c830ff5fe7716
parenta5d12d1264e65c213b2739cb2ae24099c938cff6
Merge commit 'rob/config-refactor' into experimental

Conflicts:
uzbl.c
uzbl.c
uzbl.h