From: Popa Adrian Marius <mapopa@reea.net>
Date: Mon, 28 Apr 2014 09:14:01 +0000 (+0300)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~337^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0edf1d4fe6141cb8407604cfb1afdd203ec1e9a9;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Cleanup ZEND_MODULE_API_NO => 20050922
---

0edf1d4fe6141cb8407604cfb1afdd203ec1e9a9