Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:35:29 +0000 (11:35 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:35:29 +0000 (11:35 +0200)
commitcaeaf47971f6d8efa721b2faea00e0cd8d869ecb
treec7dc10c56debb6c20aedbca180093278b9caed4a
parentd9cb4d61eaeabdfa0c12636668c9f4a29a253932
parent4d686aad68d77375518ed1255abe61d5208d7f8a
Merge branch 'master' into phpng