granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1968fac f4ce5e7)

author	Remi Collet <remi@php.net>
	Tue, 2 Jul 2013 08:47:38 +0000 (10:47 +0200)
committer	Remi Collet <remi@php.net>
	Tue, 2 Jul 2013 08:47:38 +0000 (10:47 +0200)
commit	8f0567581e942a56c8e73d4672387a38bcb43eb8
tree	7a464ac220792a8f6ad7ece7feb9ed97f59cbd91	tree \| snapshot
parent	1968fac697946e813074c68bb9c8d2f916f9bab4	commit \| diff
parent	f4ce5e7fb65ce215ea5fd182a90aaa4d634f6023	commit \| diff

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

ext/phar/Makefile.frag

Unnamed repository; edit this file 'description' to name the repository.