com php-src: Merge branch 'PHP-5.5': php.ini-development php.ini-production
| From: | Adam Harvey | Date: | Mon, 09 Sep 2013 23:59:26 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': php.ini-development php.ini-production | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73171@lists.php.net to get a copy of this message | ||
Commit: b8beb657ca725913ab8568eb218691bdd2f838c5
Author: Adam Harvey <aharvey@php.net> Mon, 9 Sep 2013 16:59:26 -0700
Parents: 2240f9531be40a8d186c47c9f3689c0b72e1a11f d209c362d2d59b0ceb82ff300cc868933ae23a06
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b8beb657ca725913ab8568eb218691bdd2f838c5
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
Tinker with the wording of the short_open_tag description.
Conflicts:
php.ini-development
php..ini-production
Changed paths:
MM php.ini-development
MM php..ini-production
Diff: