Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Fri, 12 Jun 2015 07:32:34 +0000 (09:32 +0200)
committerMichael Wallner <mike@php.net>
Fri, 12 Jun 2015 07:32:34 +0000 (09:32 +0200)
commita9a95e13578c3b57be0e60898e13babd001d2698
tree30cdcec25d2796d335c9bbab5ea5de7e754d5e40
parent420e806326b7c9be3130e5d97055b6215d6c7b8d
parentf6bcdde50a4ae9f9d1049ac647413d47c5c45961
Merge branch 'master' into phpng