]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Sat, 28 Jul 2012 22:05:53 +0000 (19:05 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sat, 28 Jul 2012 22:05:53 +0000 (19:05 -0300)
* PHP-5.4:
  - Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu


Trivial merge