]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 25 Dec 2013 22:30:59 +0000 (23:30 +0100)
committerAnatol Belski <ab@php.net>
Wed, 25 Dec 2013 22:30:59 +0000 (23:30 +0100)
* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date


Trivial merge