Merge commit 'rob/config-refactor' into experimental
authorDuClare <akarinotengoku@gmail.com>
Wed, 13 May 2009 13:26:05 +0000 (16:26 +0300)
committerDuClare <akarinotengoku@gmail.com>
Wed, 13 May 2009 13:26:05 +0000 (16:26 +0300)
commit7a118c44a002f7d45095697462df9b0fab009797
tree1b530d9c1d4e1f56d8545f912af17bc611be83d2
parentf2c90543e0d41108ec08fde70e19c57158b26219
parent7ad67b457eb953810536a0844781cfcd95f38476
Merge commit 'rob/config-refactor' into experimental

Conflicts:
uzbl.c
uzbl.c