From: Michael Wallner <mike@php.net>
Date: Fri, 1 Aug 2014 11:47:01 +0000 (+0200)
Subject: merge
X-Git-Tag: RELEASE_0_8_0~17
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b182d5ea363e30f87ad4f8483d0e6cef9e68b5d1;p=m6w6%2Fext-ares

merge
---

b182d5ea363e30f87ad4f8483d0e6cef9e68b5d1