From: Johannes Schlüter <johannes@php.net>
Date: Thu, 29 Mar 2012 09:44:10 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dde1bff4c6463a0ff8ed70449eea0e50451e99e8;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  This will be PHP 5.3.12
---

dde1bff4c6463a0ff8ed70449eea0e50451e99e8