Merge branch 'pull-request/877'

author Stanislav Malyshev <stas@php.net>

Mon, 1 Dec 2014 04:27:05 +0000 (20:27 -0800)

committer Stanislav Malyshev <stas@php.net>

Mon, 1 Dec 2014 04:28:25 +0000 (20:28 -0800)
author Stanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 04:27:05 +0000 (20:27 -0800)
committer Stanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 04:28:25 +0000 (20:28 -0800)
diff --cc UPGRADING

index 9d5d8e72284ee92efcfff3c76818368e052fb04f,5e2c33c7c6fdf26ba705b83939ea3419e05ca890..c81b1d11428a554b79889f36e8bfc1bf57afd56c
--- 1/UPGRADING
--- 2/UPGRADING
+++ b/UPGRADING
@@@ -87,7 -81,7 +87,8 @@@ PHP X.Y UPGRADE NOTE
   ========================================
   6. New Functions
   ========================================
--
++- GMP
++  Added gmp_random_seed()
   
   ========================================
   7. New Classes and Interfaces
diff --cc ext/gmp/gmp.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Mon, 1 Dec 2014 04:27:05 +0000 (20:27 -0800)
committer	Stanislav Malyshev <stas@php.net>
	Mon, 1 Dec 2014 04:28:25 +0000 (20:28 -0800)
		1	2
UPGRADING	patch \|	diff1 \|	diff2 \|	blob \| history
ext/gmp/gmp.c	patch \|	diff1 \|	diff2 \|	blob \| history