From: Pierre Joye <pierre.php@gmail.com>
Date: Sun, 9 Mar 2014 20:17:06 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~502^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba79c45174aa70597e52ff85744927c4d1108e83;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)

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

ba79c45174aa70597e52ff85744927c4d1108e83