]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorFerenc Kovacs <tyrael@php.net>
Sat, 3 May 2014 00:51:46 +0000 (02:51 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 3 May 2014 00:51:46 +0000 (02:51 +0200)
commita6a1785e23eba03f71998cc2f58e0293edeed82e
tree84097a567d099d23eb1fc70b6060b09cb3426375
parent2f1148ae8a09cf7644255c31162819d04285bab2
parent58f4bf441a89bde7e91e3a8fdcd900cbc61df558
Merge branch 'PHP-5.5'

* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654