From: Pierre Joye <pierre.php@gmail.com>
Date: Sat, 20 Apr 2013 16:23:21 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d818fdcc474c6eee0567d00b648dfb2fc7b2892c;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
---

d818fdcc474c6eee0567d00b648dfb2fc7b2892c