From: Johannes Schlüter <johannes@php.net>
Date: Thu, 24 May 2012 22:25:16 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf73fb5f75bd9ddc9024b765c28936eed75cb784;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #62146 	com_dotnet cannot be built shared, tested by Anatoliy
  Those changes are in 5.3.15
  - BFN
---

cf73fb5f75bd9ddc9024b765c28936eed75cb784