]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 14 May 2014 05:21:50 +0000 (22:21 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 14 May 2014 05:21:50 +0000 (22:21 -0700)
commitb17efe82ff8f0b3c4fd80fc693c914a436e1ebb6
treed94e25b5abb603f72e82b2761c1595d2a69e43b4
parent6b6a58c9043e22576832c9532e74ab6a835871e0
parentb1c944dfd2889e3a3517c404812d20abe5ce92e6
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.30 next

Conflicts:
configure.in
main/php_version.h