Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:38:56 +0000 (11:38 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:38:56 +0000 (11:38 +0200)
commit686c3eb652e7b639cd6c7a5cebfd87ff6b53bf76
tree573260cfc4d1fddd06b0389c55ebe94cd3a0ac46
parentcaeaf47971f6d8efa721b2faea00e0cd8d869ecb
parenta829e68cf3b324b6cda5c49b4e22bd8a6718699f
Merge branch 'master' into phpng