From: Xinchen Hui <laruence@php.net>
Date: Tue, 20 Mar 2012 07:42:25 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~419
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a42558832f729bdd59934b322aced68596d8173;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Minor change, test using php mail address as account
---

1a42558832f729bdd59934b322aced68596d8173