Fixed external entity loading
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed external entity loading

Conflicts:
	ext/libxml/libxml.c
	ext/libxml/php_libxml.h
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed external entity loading