diff options
author | Julien Pauli <jpauli@php.net> | 2014-02-17 10:36:13 +0100 |
---|---|---|
committer | Julien Pauli <jpauli@php.net> | 2014-02-17 10:36:13 +0100 |
commit | baafdad1503943150617654240780a170156d92a (patch) | |
tree | adacca06b96aa457d738b7e5eddcfaa4457b8bba /ext/mssql/php_mssql.c | |
parent | f7f524aada86241c6c0e3c9ae2e7bdbfd533089e (diff) | |
parent | 786234d351c40a9b4808d1dd13d2f91f2f5314be (diff) | |
download | php-git-baafdad1503943150617654240780a170156d92a.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Export JsonSerializable Interface (bug #65753)
Diffstat (limited to 'ext/mssql/php_mssql.c')
0 files changed, 0 insertions, 0 deletions