From: Rasmus Lerdorf <rasmus@php.net>
Date: Sat, 3 Aug 2013 16:15:16 +0000 (-0400)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.6.0alpha1~349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cadbec2fa07e2e0fda85ea59370ed64c934db68c;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix phar phpinfo test after markup changes
---

cadbec2fa07e2e0fda85ea59370ed64c934db68c