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

Merge branch 'PHP-5.5'

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

4e56ac50e5f40545de1735bde28e07e61cfd328d