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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo in php man page
---

1aeb2514fe210c99c3e566d59788e76a8b3018d8