vcs.maemo.org Git - uzbl-mobile/commit

author	Brendan Taylor <whateley@gmail.com>
	Sat, 11 Jul 2009 16:44:18 +0000 (10:44 -0600)
committer	Brendan Taylor <whateley@gmail.com>
	Sat, 11 Jul 2009 16:44:18 +0000 (10:44 -0600)
commit	29032b6fb02cb5e7b29bf761e6c75bb71c1aa7be
tree	b4d6a1cae391a0a41ad4c68cc37d3d3a3e641428	tree \| snapshot
parent	633c4bd519e3f3557526e0b4b5cc0e90868f80b3	commit \| diff
parent	0e985d44b7a2a86620c878915e480ec9ddb491bf	commit \| diff

Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template

Conflicts:
uzbl.c

Unnamed repository; edit this file to name it for gitweb.