]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 11 Jun 2014 12:59:39 +0000 (14:59 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 11 Jun 2014 12:59:39 +0000 (14:59 +0200)
* PHP-5.6:
  Revert "Add optional second arg to unserialize()"

1  2 
ext/standard/basic_functions.c

Simple merge