Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 11 Jun 2013 01:16:09 +0000 (18:16 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 11 Jun 2013 01:16:09 +0000 (18:16 -0700)
* PHP-5.4:
  fix double entry
  Merge branch 'pull-request/341'


Trivial merge