From: Remi Collet <remi@php.net>
Date: Tue, 2 Jul 2013 08:47:38 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~17^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f0567581e942a56c8e73d4672387a38bcb43eb8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
---

8f0567581e942a56c8e73d4672387a38bcb43eb8