From: Jakub Zelenka Date: Sun, 8 Mar 2015 10:47:22 +0000 (+0000) Subject: Merge branch 'pull-request/1151' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~772 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cb869d908ab0427ede6596009176c22b43a2aae;p=php Merge branch 'pull-request/1151' --- 0cb869d908ab0427ede6596009176c22b43a2aae