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

2012-05-25 Thread Xinchen Hui 
Commit:91ad40d9bbc772709fb9f88c55d7ce55f55df71b
Author:Xinchen Hui larue...@php.net Fri, 25 May 2012 22:33:17 
+0800
Parents:   16a592b13a7909aa9d370fd020a10e00772bc254 
c3547f19359c7150a9bbd35aa2a7adc9da900da5
Branches:  PHP-5.4

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

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62128 superfluous ;

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

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

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

2012-04-18 Thread Johannes Schluuml;ter 
Commit:cc85e7c31391de9acdd348c947c9165520a924a2
Author:Johannes Schlüter johan...@php.net Thu, 19 Apr 2012 
00:08:36 +0200
Parents:   900751e8ae4ed2af3e63e7c355fac59f6f932254 
710021d1d4a57941450b7ed482e3c19cfe62fecf
Branches:  PHP-5.4 master

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

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix slight grammar glitch (thanks Dan Brown)

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