From: Stanislav Malyshev <stas@php.net>
Date: Tue, 11 Jun 2013 01:16:09 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~29^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8acf9a4fe6d4af175c8330004a67c2aa3cb4b0df;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix double entry
  Merge branch 'pull-request/341'
---

8acf9a4fe6d4af175c8330004a67c2aa3cb4b0df