Merge branch 'elinks-0.12' into elinks-0.13
commit40f319ce22357cbf58d93dbb4f36c6bfdaf932de
authorKalle Olavi Niemitalo <kon@iki.fi>
Mon, 21 Jan 2008 23:09:18 +0000 (22 01:09 +0200)
committerKalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi>
Mon, 21 Jan 2008 23:09:18 +0000 (22 01:09 +0200)
tree461002728720d75bb3053097bb8511ee41c69dbf
parentd14740af2e3c1b9bbd8857ec0d58ad2289e85fc1
parent4e7980d727482a92bafe6f360a2b6359a1e077f5
Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

po/pl.po
NEWS
src/network/socket.c