]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4664d1 35a68c2)
Merge branch 'PHP-5.5' into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Mon, 16 Feb 2015 15:09:52 +0000 (13:09 -0200)
committerFelipe Pena <felipensp@gmail.com>
Mon, 16 Feb 2015 15:09:52 +0000 (13:09 -0200)
* PHP-5.5:
  - Fix merge
  BFN


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.