Merge branch 'master' of git://repo.or.cz/conkeror
commitb020ae3c480ab605840ebeddcbde322ac99cbdcf
authorNelson Elhage <nelhage@mit.edu>
Sat, 22 Mar 2008 03:37:55 +0000 (21 23:37 -0400)
committerNelson Elhage <nelhage@phanatique.(none)>
Sat, 22 Mar 2008 03:37:55 +0000 (21 23:37 -0400)
treed540e989f8f85967b0f91f1c3f6320cc1d1e4ee6
parentff8e17cd46beee728b5e6efa30c8122679beb488
parent479787289db5d480bfce618f7546bc4b3d76f4ac
Merge branch 'master' of git://repo.or.cz/conkeror