]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Thu, 24 May 2012 22:25:16 +0000 (00:25 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 24 May 2012 22:25:16 +0000 (00:25 +0200)
* PHP-5.4:
  Fix bug #62146  com_dotnet cannot be built shared, tested by Anatoliy
  Those changes are in 5.3.15
  - BFN


Trivial merge