]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Tue, 6 May 2014 10:36:55 +0000 (12:36 +0200)
committerMichael Wallner <mike@php.net>
Tue, 6 May 2014 10:36:55 +0000 (12:36 +0200)
* PHP-5.6:
  XFAIL-- for bug #67198
  remove useless indirection
  fix bug #67198 (php://input regression)


Trivial merge