]> granicus.if.org Git - php/commit
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)
commitec974c439724e8b4151412eaa0caba5aec5e1c49
tree975b9f0da0864ece1d90a47478182cf4dd25224b
parent6953d33d309b2d390f829e2708339598fbc83415
parentc38ab260fe3a40cce049c835fb7833de00ab977c
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Add optional second arg to unserialize()"
ext/standard/basic_functions.c