]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 22:07:13 +0000 (00:07 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 22:07:13 +0000 (00:07 +0200)
* PHP-5.5:
  sigh, can't even copypaste without screwing up


Trivial merge