From: Will Fitch <willf@aweber.com>
Date: Fri, 24 Jan 2014 02:35:24 +0000 (-0500)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~388^2~19^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9b40a20fcd6c3c06c62908bc1e7b8a645ecd3c2;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update gitignore and Makefile for additional entries
---

a9b40a20fcd6c3c06c62908bc1e7b8a645ecd3c2