]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Wed, 3 Jul 2013 14:58:20 +0000 (16:58 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 3 Jul 2013 14:58:20 +0000 (16:58 +0200)
commit631bb27dcacf625e35f6dacc5e8df0b45624531a
tree394a8755c2d4eb876ed707fd1c48006859d262d7
parent5324416b6514b6de53e7de269bc18b5807701051
parent0265c2d961aa99e00361d6ab0f845dc1e8782558
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/acinclude.m4
ext/mysqli/mysqli_nonapi.c