]> granicus.if.org Git - php/commitdiff
Merge branch '5.4' into PHP-5.4
authorBoris Lytochkin <lytboris@php.net>
Thu, 19 Dec 2013 21:00:46 +0000 (01:00 +0400)
committerBoris Lytochkin <lytboris@php.net>
Thu, 19 Dec 2013 21:00:46 +0000 (01:00 +0400)
* 5.4:
  keep 'em sorted
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations


Trivial merge