]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Fri, 20 Mar 2015 12:34:35 +0000 (13:34 +0100)
committerFerenc Kovacs <tyrael@php.net>
Fri, 20 Mar 2015 12:34:35 +0000 (13:34 +0100)
commit95c3a4798f970810555b9da9a1f2b0fdedb504e6
treee91051dfef0a92831dcf7ada2140e39ab1778ed3
parentd55b42bd6193796523113ccc4c34fcd4da89fdf2
parent9ff99059b15334fb05498686f422d39f1584d882
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add pear to the travis build
travis/compile.sh