From: Stanislav Malyshev <stas@php.net>
Date: Mon, 25 Mar 2013 03:04:28 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~90^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f25c3283ae8d9338f371ddff5bc29a9c0bd2a6fa;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix typo
  add definition for 5.5
---

f25c3283ae8d9338f371ddff5bc29a9c0bd2a6fa