From: Remi Collet <remi@php.net>
Date: Thu, 5 Jun 2014 15:45:59 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~238^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a5d5d1db43e670427f83760afbdec3b28eab3d0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  drop exec perm on doc files
---

6a5d5d1db43e670427f83760afbdec3b28eab3d0
diff --cc UPGRADING
index 7a174c47c2,510abcc7b6..7a174c47c2
mode 100755,100644..100644
--- a/UPGRADING
+++ b/UPGRADING