Merge upstream changes for 0.5.2
commit921471641aa55573100ce88189f060e36998e8a6
authorygrek <ygrek@autistici.org>
Sat, 16 Jan 2010 15:21:01 +0000 (16 17:21 +0200)
committerygrek <ygrek@autistici.org>
Sat, 16 Jan 2010 15:21:32 +0000 (16 17:21 +0200)
tree53599d515617d531ca99c682b35c5ab5943ff2a7
parent94b3997618830033887a1db6a20c368c3b3040e1
parentda641a87049c51afeed5774bf2c40d5490ea8fca
Merge upstream changes for 0.5.2

Conflicts:

Makefile.in
curl-helper.c
Makefile.in
curl-helper.c