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

* 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