From: Felipe Pena <felipensp@gmail.com>
Date: Tue, 25 Jun 2013 19:26:36 +0000 (-0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~26^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d01ca1342c2487d6f825997eeac8aeddac4cf384;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
---

d01ca1342c2487d6f825997eeac8aeddac4cf384