]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDavid Soria Parra <dsp@php.net>
Fri, 22 Mar 2013 16:45:07 +0000 (17:45 +0100)
committerDavid Soria Parra <dsp@php.net>
Fri, 22 Mar 2013 16:45:07 +0000 (17:45 +0100)
* PHP-5.5:
  Note about bison version
  Add SplDoublyLinkedList::add to UPGRADING
  Tweaks an add OPcache info to UPGRADING

Conflicts:
UPGRADING


Trivial merge