Merge branch 'experimental' of git+ssh://repo.or.cz/srv/git/conkeror into experimental
commitab5d225f3a7a9b538b3af659a3735a7a93f6c7f6
authorJohn Foerch <jjfoerch@earthlink.net>
Thu, 1 Nov 2007 01:39:18 +0000 (31 21:39 -0400)
committerJohn Foerch <jjfoerch@earthlink.net>
Thu, 1 Nov 2007 01:39:18 +0000 (31 21:39 -0400)
tree734646e4f8b6a0c074c8c5005b31956a57a3d2fa
parent1ac81e29180555a3f12c800f4abe15117d90eb2f
parent027b8eba651d8e213806d88b20c476bab77b3e7e
Merge branch 'experimental' of git+ssh://repo.or.cz/srv/git/conkeror into experimental