merge in from salinasv
authorBarrucadu <mike@barrucadu.co.uk>
Tue, 19 May 2009 19:04:58 +0000 (20:04 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Tue, 19 May 2009 19:04:58 +0000 (20:04 +0100)
commit6ac8a0d07f02dd99a78d3569a6637e5ea44e5cb0
treef847df3bef4e47ff00d3c593aa4e7f19de1e2f5a
parenta08041ad731ed6a8aac2e626bd6a5a6e00713759
merge in from salinasv

Conflicts:

uzbl.c
uzbl.h
AUTHORS
uzbl.c
uzbl.h