]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorAdam Harvey <aharvey@php.net>
Mon, 9 Sep 2013 23:59:26 +0000 (16:59 -0700)
committerAdam Harvey <aharvey@php.net>
Mon, 9 Sep 2013 23:59:26 +0000 (16:59 -0700)
commitb8beb657ca725913ab8568eb218691bdd2f838c5
tree2fd6e03fef145bbe0373e82ec2fdf67d674b4b40
parent2240f9531be40a8d186c47c9f3689c0b72e1a11f
parentd209c362d2d59b0ceb82ff300cc868933ae23a06
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
php.ini-development
php.ini-production