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)
1  2 
scripts/gen_travis_yml.php

Simple merge