]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanley Sufficool <ssufficool@php.net>
Fri, 27 Sep 2013 03:16:28 +0000 (20:16 -0700)
committerStanley Sufficool <ssufficool@php.net>
Fri, 27 Sep 2013 03:16:28 +0000 (20:16 -0700)
commit577b10b214e769f5938c0c82129d3c790d86f61f
tree4d8eaf9f5a2081762b6a0745ee5256608ede965c
parent69454d9f0f765416f245acbc626b3984dcbf5e1d
parentac05cfb49912dd87264573df930d0ead3c3e0cca
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver