From: Julien Pauli <jpauli@php.net>
Date: Wed, 2 Sep 2015 15:55:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.14RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c65350cd4d84302e4c4779ab8e5092f833d8425f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Merge branch 'PHP-5.6'
  bump version
---

c65350cd4d84302e4c4779ab8e5092f833d8425f