From: Lior Kaplan <kaplanlior@gmail.com>
Date: Thu, 13 Mar 2014 10:41:48 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~478^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f120463efe073f61c4e8052eed36f3156e74f3f0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

f120463efe073f61c4e8052eed36f3156e74f3f0