From: Stanislav Malyshev <stas@php.net>
Date: Fri, 12 Jul 2013 17:55:37 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64b11f89181b776afdad470a91ea1759b90c9299;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update 5.4.17 date
---

64b11f89181b776afdad470a91ea1759b90c9299