Fixed bug bug #64713 Compilation warnings in finfo
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug bug #64713 Compilation warnings in finfo
updated libmagic.patch
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch
Fix memory realted to #64726
Merge branch 'PHP-5.3' into PHP-5.4
Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
Merge branch 'PHP-5.4' into PHP-5.5
Update NEWS
Also fixed bug #64726 in 5.3
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
fix #64725, wrong res check
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Revert "Fix conversion from unsigned char to char"

This reverts commit bc50ba4bf971c62a1ff5b915a0c9f890b04c1087.
Revert "Add CURL_WRAPPERS_ENABLE constant"

This reverts commit d7f709a032a40cb475042b43db07a4698a2488b7.
Since wrappers are deleted from 5.5, no point in adding this constant.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "Add CURL_WRAPPERS_ENABLE constant"

Conflicts:
	ext/curl/interface.c
Fixed compilation warnings (issue #92)
Avoid possible conditional jump depended on uninitialised value
 fix #64738, fix implicit type declaration