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)
commit695931cf8e38da79a987ac65dc2408c7c20612c1
treebaa4fab47fcffa2c05e99baddc7edccc88b3f9bf
parent964a7600b98dbdd4f03205b17ef93ef7850186fe
parentd4492f955d1fe915f0ac662772ad43c04682986d
Merge branch 'master' of github.com:bagder/curl

Merge for resync