]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 20:26:50 +0000 (12:26 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 20:26:50 +0000 (12:26 -0800)
commitfaa396c67d4631698367bdefd3d22f3662cc49cb
tree7dc7a9325b070e93599f1deea4239eb0174d7bb1
parent3578e5b25008157abd086e52ec1d179566359610
parentf86aa349eb068b6865c6d423054afe7f781f979e
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  move tests into proper place