Merge branch 'master' of github.com:bagder/curl
authorPatrick Monnerat <pm@datasphere.ch>
Mon, 12 Nov 2012 13:27:43 +0000 (14:27 +0100)
committerPatrick Monnerat <pm@datasphere.ch>
Mon, 12 Nov 2012 13:27:43 +0000 (14:27 +0100)

Trivial merge