From: Remi Collet <remi@php.net>
Date: Thu, 5 Jun 2014 15:46:21 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_PHPNG_MERGE~221^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e16097626a7e86e0baa9fa7d17477b6ffc13c706;p=php

Merge branch 'PHP-5.6'

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

e16097626a7e86e0baa9fa7d17477b6ffc13c706
diff --cc UPGRADING
index 740047a86a,7a174c47c2..740047a86a
mode 100755,100644..100644
--- a/UPGRADING
+++ b/UPGRADING