Merge branch 'curl'
authorJean Privat <jean@pryen.org>
Thu, 1 Aug 2013 20:54:22 +0000 (16:54 -0400)
committerJean Privat <jean@pryen.org>
Thu, 1 Aug 2013 20:54:22 +0000 (16:54 -0400)

Trivial merge