Merge branch 'ah/fix-http-push' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:29:07 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:29:07 +0000 (10:29 -0700)
commitcd989a97ec5bdb612693fbbed98b7adeb52a83a0
treeb823c92a4afa80790f3e1cfbb999ebe8cf3ccc9b
parent0d854fc1e35c145f81d97c4565bd6c07a7d47f19
parent479eaa8ef8384d8026dc05c1288e96ffd9e296d6
Merge branch 'ah/fix-http-push' into maint

* ah/fix-http-push:
  http-push.c: make CURLOPT_IOCTLDATA a usable pointer
http-push.c