From: Lior Kaplan <kaplanlior@gmail.com>
Date: Thu, 13 Mar 2014 10:40:14 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=356c442558661a2be00bfe7acd6a9abc4c7f97d0;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Typo fix: sicret -> secret
---

356c442558661a2be00bfe7acd6a9abc4c7f97d0