From: Sara Golemon <pollita@php.net>
Date: Thu, 14 Aug 2014 16:44:14 +0000 (-0700)
Subject: Merge branch 'pull-request/658'
X-Git-Tag: PRE_PHPNG_MERGE~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37e91cc5d34598b05bcd377f3115f36b43e786ac;p=php

Merge branch 'pull-request/658'
---

37e91cc5d34598b05bcd377f3115f36b43e786ac