Merge branch 'elinks-0.12' into elinks-0.13
commitdee220026d51c5f3f82c05d7c674441927b65a5a
authorKalle Olavi Niemitalo <kon@iki.fi>
Mon, 19 Nov 2007 22:41:30 +0000 (20 00:41 +0200)
committerKalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi>
Mon, 19 Nov 2007 22:41:30 +0000 (20 00:41 +0200)
tree1b6d1d0e042523650aaa1cb8e138970a068261e0
parent9297853d20a62289bc3cdf0629e97c7bfa8dd0b7
parentcbcc0e823034d742fa1e50176e53adc84dcc82af
Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

po/fr.po (time stamps only)
NEWS
po/pl.po