From: Anatoliy Belsky <ab@php.net>
Date: Wed, 25 Apr 2012 16:53:56 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~264
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71f620d4367205830b58575c2c7d7bbfa9ad2736;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Partial fix for bug 61743 to get correct icacls path
  sync version

Conflicts:
	configure.in
---

71f620d4367205830b58575c2c7d7bbfa9ad2736