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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix the date for 5.4.17
---

657116f12e19ea66572b6bd8fd703bef0b16efca