]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Wed, 29 Apr 2015 09:21:18 +0000 (11:21 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 29 Apr 2015 09:21:18 +0000 (11:21 +0200)
commitd004c1d5fff77451ff3c6e96cfd8a11dbd83eb0a
tree22618afbd08e1907bcfa65672b863ed3ccdd37b5
parentce9b6e5ee80c26a5cb785abdec60510f6b7620e8
parent775d0707ca2f802c9db549aa442be82fc09362ab
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.26 now

Conflicts:
configure.in
main/php_version.h