diff options
| author | Michael Wallner <mike@php.net> | 2013-08-20 00:08:55 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-08-20 00:08:55 +0200 |
| commit | 9d2cdacf4a36045120aab049b03229bf0064df4e (patch) | |
| tree | 0003c8c1dbd05a4ca04bbd5cf0a13a512b0bf1d4 /ext/intl/breakiterator/codepointiterator_methods.cpp | |
| parent | 69f12ad582c102c1d7b3b2c0ae6cf7cd633dfe1d (diff) | |
| parent | 1ac4d8f2c632f5be5a02d49c1e0d3b1fb515e4a8 (diff) | |
| download | php-git-9d2cdacf4a36045120aab049b03229bf0064df4e.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #65481 (shutdown segfault due to serialize)
Conflicts:
ext/standard/var_unserializer.c
Diffstat (limited to 'ext/intl/breakiterator/codepointiterator_methods.cpp')
0 files changed, 0 insertions, 0 deletions