Merge branch 'master' of git://repo.or.cz/conkeror
commitf6ec4d34e828485f556f80bcdf2db4281472944c
authorNelson Elhage <nelhage@mit.edu>
Sat, 22 Mar 2008 15:19:58 +0000 (22 11:19 -0400)
committerNelson Elhage <nelhage@phanatique.(none)>
Sat, 22 Mar 2008 15:19:58 +0000 (22 11:19 -0400)
tree938cb7d3fae0ed462d488dcaa6225247fff0ce6a
parentb020ae3c480ab605840ebeddcbde322ac99cbdcf
parent260659411f08810897d1f989e4c7e9f39d197a21
Merge branch 'master' of git://repo.or.cz/conkeror