]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDavid Soria Parra <davidsp@fb.com>
Tue, 21 Jan 2014 15:20:14 +0000 (16:20 +0100)
committerDavid Soria Parra <davidsp@fb.com>
Tue, 21 Jan 2014 15:20:14 +0000 (16:20 +0100)
* PHP-5.6:
  Change automaticaly to automatically


Trivial merge