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


Trivial merge