Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Fri, 12 Jun 2015 07:39:46 +0000 (09:39 +0200)
committerMichael Wallner <mike@php.net>
Fri, 12 Jun 2015 07:39:46 +0000 (09:39 +0200)
commita4ba9ab78a90775d7e93198b5df1d77eba287a19
treec783f9eeef1f62581fb20c42fa8fb08ce1186a34
parenta9a95e13578c3b57be0e60898e13babd001d2698
parent652ddf1b172527cb4f7367ddac469837d49d81cf
Merge branch 'master' into phpng