Merge branch 'master' of github.com:bagder/curl
authorPatrick Monnerat <pm@datasphere.ch>
Mon, 15 Jul 2013 14:55:30 +0000 (16:55 +0200)
committerPatrick Monnerat <pm@datasphere.ch>
Mon, 15 Jul 2013 14:55:30 +0000 (16:55 +0200)
Merge for resync


Trivial merge