]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:13:53 +0000 (16:13 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:13:53 +0000 (16:13 -0700)
* PHP-5.5:
  __wakeup doesn't have to be final


Trivial merge