]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Wed, 17 Apr 2013 11:20:46 +0000 (13:20 +0200)
committerAnatol Belski <ab@php.net>
Wed, 17 Apr 2013 11:20:46 +0000 (13:20 +0200)
* PHP-5.4:
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10


Trivial merge