From: ULF WENDEL <uw@php.net>
Date: Sat, 29 Sep 2012 10:17:13 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha1~30^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13d4d8e2d037385bfa2c7775929b65ae1f73998d;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Minor changes for MySQL 5.6
  NEWS for 76601c4

Conflicts:
	NEWS
---

13d4d8e2d037385bfa2c7775929b65ae1f73998d