From: Christopher Jones <sixd@php.net>
Date: Tue, 25 Jun 2013 20:23:50 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.2RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3675b953f674ad365708584d0a8ca468829e2882;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
---

3675b953f674ad365708584d0a8ca468829e2882