Merge branch 'experimental' of git://github.com/Dieterbe/uzbl
authorRobert Manea <gotmor@gmail.com>
Fri, 24 Jul 2009 11:11:06 +0000 (13:11 +0200)
committerRobert Manea <gotmor@gmail.com>
Fri, 24 Jul 2009 11:11:06 +0000 (13:11 +0200)
commitf7016761d895933ba23531e0c2faecf207de8fc5
tree4ce17b7544630ac116da0219b7c1e1cf07ad315d
parent7bcec7796b361986a83203869735c793871f7932
parente0a3e5e4ff2b2d038df52936c5ccd4b3b40e198d
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl

Conflicts:
uzbl.c
uzbl.h
uzbl.c