From: Felipe Pena <felipensp@gmail.com>
Date: Mon, 21 May 2012 11:55:05 +0000 (-0300)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d1486016a6b2be2e7765fed0a425c22370c72bf;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fix the fix (typo s/AIX/_AIX/g)
---

1d1486016a6b2be2e7765fed0a425c22370c72bf