diff options
| author | Adam Harvey <aharvey@php.net> | 2013-09-09 16:59:26 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-09-09 16:59:26 -0700 |
| commit | b8beb657ca725913ab8568eb218691bdd2f838c5 (patch) | |
| tree | 2fd6e03fef145bbe0373e82ec2fdf67d674b4b40 /scripts | |
| parent | 2240f9531be40a8d186c47c9f3689c0b72e1a11f (diff) | |
| parent | d209c362d2d59b0ceb82ff300cc868933ae23a06 (diff) | |
| download | php-git-b8beb657ca725913ab8568eb218691bdd2f838c5.tar.gz | |
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions