[PHP-CVS] com php-src: Merge branch 'PHP-5.5': php.ini-development php.ini-production

[Stanislav Malyshev]

Commit:    992bba6aef0ad8063f225dd4c0b77d755133c8e5
Author:    Stanislav Malyshev <s...@php.net>         Mon, 28 Jan 2013 22:56:51 
-0800
Parents:   383e3172691d04232ebb74aef8628b8b63da3698 
389d41cc2e32496de2beb05c77f34bfd868c64a0
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=992bba6aef0ad8063f225dd4c0b77d755133c8e5

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add news for bug #60524
  Implemented Feature #60524 (sys_temp_dir)

Conflicts:
        UPGRADING

Bugs:
https://bugs.php.net/60524

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php