Merge branch 'experimental-buffers' of git+ssh://repo.or.cz/srv/git/conkeror into...
commitc2492ecc0e741b6edea94a5a3e6199b40bc65a51
authorJohn Foerch <jjfoerch@earthlink.net>
Sun, 23 Dec 2007 21:13:01 +0000 (23 16:13 -0500)
committerJohn Foerch <jjfoerch@earthlink.net>
Sun, 23 Dec 2007 21:13:01 +0000 (23 16:13 -0500)
tree2ea010eff457623e5e3dd6de2215867e227548b6
parentcb449f5d7300b81fb85657cca34f427aebcb97a7
parent797d1f499101346d5060243e7b74ee9cdb5f1733
Merge branch 'experimental-buffers' of git+ssh://repo.or.cz/srv/git/conkeror into experimental-buffers