]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Thu, 5 Feb 2015 08:41:55 +0000 (00:41 -0800)
committerStanislav Malyshev <stas@php.net>
Thu, 5 Feb 2015 08:41:55 +0000 (00:41 -0800)
commit2c386b55f2f967e7846019c4dd4660e7c7807c0b
tree46d292c94d4835749c33271d42d5a01ce6a33ebd
parentd33f4c6eb8916567028301d53b71a8d60664de4a
parent10b15f0f8b5c294faab35dcbaf8d79dd3d24d153
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test to not hit php.net