diff options
| author | Michael Wallner <mike@php.net> | 2015-03-30 14:42:37 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2015-03-30 14:42:37 +0200 |
| commit | 90a8b59e9c22b5ed75a08679da06e3737b9e547d (patch) | |
| tree | b1c111de9bc5dcf08ffe8f2cdd70fc7ec660c419 /Zend/zend_inheritance.c | |
| parent | 3a660bf3a5a73c10e05eccfcdf26d978f585f0af (diff) | |
| parent | 8f7e378b9f2fb4f2bb5605d9440d7d34bee6978a (diff) | |
| download | php-git-90a8b59e9c22b5ed75a08679da06e3737b9e547d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix bug #67761
Diffstat (limited to 'Zend/zend_inheritance.c')
0 files changed, 0 insertions, 0 deletions