]> granicus.if.org Git - php/commit
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)
commitc76cdb806753b57d13d598c7752598f94254f120
tree0ef6240fbd212f17be3a610e4cb1995ab4d0aca5
parentca425a67c439d4230356e90a9bcf5996c4d15e3a
parentecf76e2da81ca23d8e53d010ad1190129eb417ab
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10