From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 10 Mar 2014 11:10:57 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~22^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2e42d53729d065537d7576a2fd2975ff94e6ae6;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
	win32/build/confutils.js
---

d2e42d53729d065537d7576a2fd2975ff94e6ae6