From: Ferenc Kovacs Date: Wed, 27 Aug 2014 01:54:06 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_REMOVALS~283 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c9eb92856fb8c3b2d38057bc017c556abf6e702;p=php Merge branch 'PHP-5.6' * PHP-5.6: remove the -dev suffix from the Zend version Conflicts: Zend/zend.h --- 4c9eb92856fb8c3b2d38057bc017c556abf6e702