diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-26 15:17:46 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-26 15:17:46 +0200 |
| commit | 94d96f77826e46f114d4bc1777e1edcdfef002a2 (patch) | |
| tree | 1dc830f7292ff5a2af6bb263bc5243bd4c42cb00 /Zend/tests/traits/property006.phpt | |
| parent | 19df3c1b1c3bcb120ba63d3537e7177b8826fb96 (diff) | |
| parent | 4daab0abecd5ee583c005d8e7b6affc08af8639d (diff) | |
| download | php-git-94d96f77826e46f114d4bc1777e1edcdfef002a2.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
Conflicts:
ext/sqlite3/tests/sqlite3_15_open_error.phpt
Diffstat (limited to 'Zend/tests/traits/property006.phpt')
0 files changed, 0 insertions, 0 deletions