]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Fri, 27 Jun 2014 14:29:35 +0000 (16:29 +0200)
committerFerenc Kovacs <tyrael@php.net>
Fri, 27 Jun 2014 14:29:35 +0000 (16:29 +0200)
* PHP-5.5:
  removing the format added by mistake, props to Solar Designer for spotting this.


Trivial merge