From: Remi Collet <remi@php.net>
Date: Thu, 5 Jun 2014 15:45:41 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.14RC1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e31b51f9a0e5beadb250c67a0865539b3e9fb222;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

e31b51f9a0e5beadb250c67a0865539b3e9fb222
diff --cc UPGRADING
index 510abcc7b6,74f59e6136..510abcc7b6
mode 100755,100644..100644
--- a/UPGRADING
+++ b/UPGRADING