From: ULF WENDEL <uw@php.net>
Date: Tue, 23 Oct 2012 11:16:12 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.4.9RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38b632dd7c1d6a935f859e53d69cc3ce3c373c94;p=php

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)
---

38b632dd7c1d6a935f859e53d69cc3ce3c373c94