Merge commit 'rob/master' into experimental
authorDuClare <akarinotengoku@gmail.com>
Tue, 19 May 2009 18:21:39 +0000 (21:21 +0300)
committerDuClare <akarinotengoku@gmail.com>
Tue, 19 May 2009 18:21:39 +0000 (21:21 +0300)
commitbe1ee726f6e2941295012773d6de879223570e2d
tree17a8d100f3ca37bfe76fe6b0d2b486292c310339
parent757b51da21442ffc4f3b39dfe173999bfcb8a3c8
parentef431d779db7142d00e4acabb3445ca7d02203e5
Merge commit 'rob/master' into experimental

Also fixed a ptr bug in set_var_value.

Conflicts:
uzbl.c
uzbl.c
uzbl.h