]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 743a74a 459e758)
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Wed, 25 Apr 2012 16:53:56 +0000 (18:53 +0200)
committerAnatoliy Belsky <ab@php.net>
Wed, 25 Apr 2012 16:53:56 +0000 (18:53 +0200)
* PHP-5.4:
  Partial fix for bug 61743 to get correct icacls path
  sync version

Conflicts:
configure.in


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.