]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 10 Jun 2013 17:55:30 +0000 (19:55 +0200)
committerAnatol Belski <ab@php.net>
Mon, 10 Jun 2013 17:55:30 +0000 (19:55 +0200)
* PHP-5.4:
  missing colon


Trivial merge