Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

Conflicts:
	ext/mysqlnd/mysqlnd_enum_n_def.h

...

This commit is contained in:

Andrey Hristov 2013-01-09 19:03:56 +01:00

parent 1f7f8429af 258c76eb41

commit 790096b68b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available