From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 23 Feb 2015 08:57:20 +0000 (+0000)
Subject: Merge branch 'pr/1103'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a18ffe407c4c029f929d7092188bfc2fab173ec7;p=php

Merge branch 'pr/1103'
---

a18ffe407c4c029f929d7092188bfc2fab173ec7