Merge branch 'R_2_5'
authorMichael Wallner <mike@php.net>
Mon, 28 Sep 2015 14:12:37 +0000 (16:12 +0200)
committerMichael Wallner <mike@php.net>
Mon, 28 Sep 2015 14:12:37 +0000 (16:12 +0200)
Conflicts:
.gitignore
config.w32


No differences found