]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
authorULF WENDEL <uw@php.net>
Tue, 23 Oct 2012 11:15:46 +0000 (13:15 +0200)
committerULF WENDEL <uw@php.net>
Tue, 23 Oct 2012 11:15:46 +0000 (13:15 +0200)
* 'PHP-5.3' of git.php.net:php-src:
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows


Trivial merge