]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Wed, 30 May 2012 23:18:02 +0000 (01:18 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 30 May 2012 23:18:02 +0000 (01:18 +0200)
commit33849c2211891cc69d26b3633412635016d05626
tree53c02d7f9527bc6ffa5bd0ba825fab167e8cbfac
parent56532895a851851b4eacebb58cd3a0c7294031b3
parent303dd7f3469106f8cd91a8648de1c4fed51374b3
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #62186 readline fails to compile
  fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)