Merge branch 'experimental-buffers' of git+ssh://repo.or.cz/srv/git/conkeror into...
commitb14b6a69b98726552fea62077ee24af86158787a
authorJohn Foerch <jjfoerch@earthlink.net>
Mon, 24 Dec 2007 15:30:29 +0000 (24 10:30 -0500)
committerJohn Foerch <jjfoerch@earthlink.net>
Mon, 24 Dec 2007 15:30:29 +0000 (24 10:30 -0500)
tree9ded531894c614786cdaec41014213ddb34a1afc
parent93db140d76a0061d3b4733f09c791b73628ce80b
parent28d5cd10214af19cbbf2537e5a5114555449afe0
Merge branch 'experimental-buffers' of git+ssh://repo.or.cz/srv/git/conkeror into experimental-buffers