Merge branch 'R_2_5'
authorMichael Wallner <mike@php.net>
Tue, 29 Sep 2015 07:03:45 +0000 (09:03 +0200)
committerMichael Wallner <mike@php.net>
Tue, 29 Sep 2015 07:03:45 +0000 (09:03 +0200)
commita5e66b221dbf5a52cc770f4d7f46f05fe88784ba
tree0cfd777ab5ef2df13e5566ca63bb21df388b4ab1
parentb2a4f89e30c04a18ec0da23d2ff0c80c2dccf42e
parente4896f4169a9589db7131ff4b7d9ed37e0e0ace8
Merge branch 'R_2_5'
scripts/gen_travis_yml.php