]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Fri, 25 May 2012 08:53:09 +0000 (10:53 +0200)
committerAnatoliy Belsky <ab@php.net>
Fri, 25 May 2012 08:53:09 +0000 (10:53 +0200)
* PHP-5.4:
  Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
  Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build


Trivial merge