Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand...
authorBrendan Taylor <whateley@gmail.com>
Tue, 14 Jul 2009 23:56:02 +0000 (17:56 -0600)
committerBrendan Taylor <whateley@gmail.com>
Tue, 14 Jul 2009 23:56:02 +0000 (17:56 -0600)
commit25972713cd69b650feac840b85435ada9f02ed83
tree235409a6f0a99abeb18b676db29cfa63d7a36a96
parentf90cf21c5561a4ae2b282d6e095c38d06f38840e
parent5db19767e101d78ee9201f01d063e43c6697dd85
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template

Conflicts:
Makefile
Makefile