From: Hannes Magnusson <bjori@php.net>
Date: Sat, 24 Mar 2012 16:20:14 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.1RC1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a1c76538541e74719faf2311d72a70acd3c01e4;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  This is a git checkout
  Revert incorrect fix
---

7a1c76538541e74719faf2311d72a70acd3c01e4