Merge branch 'master' of https://github.com/bagder/curl
authorNick Zitzmann <nickzman@gmail.com>
Sat, 22 Jun 2013 21:16:05 +0000 (15:16 -0600)
committerNick Zitzmann <nickzman@gmail.com>
Sat, 22 Jun 2013 21:16:05 +0000 (15:16 -0600)

Trivial merge