]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Sun, 22 Apr 2012 00:25:36 +0000 (02:25 +0200)
committerJohannes Schlüter <johannes@php.net>
Sun, 22 Apr 2012 00:25:36 +0000 (02:25 +0200)
* PHP-5.4:
  Fix folding


Trivial merge