Merge branch 'R_2_5'
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 07:38:17 +0000 (09:38 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 07:38:17 +0000 (09:38 +0200)
commita072128f443ded05070efd21fb5eceb72e1869b8
tree82e2c5adeeeff6ee6482e8201bc71cb3aa0776cd
parente171fedb69ac01c96ad34129c6f9712a703dd5fa
parent132f3febe114aa64f20a571b5b226ffcdf44d861
Merge branch 'R_2_5'