Fixed bug #64070 (Inheritance with Traits failed with error)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64070 (Inheritance with Traits failed with error)

Conflicts:
	NEWS
	Zend/zend_compile.c
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
fix tests
fix the test for curl 7.29.0+
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix the test for curl 7.29.0+
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix the test for curl 7.29.0+
News for PHP 5.5.0 Alpha 5
Start new NEWS section for beta1
5.3.22 NEWS
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
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
updated lib versions
Merge branch 'bug49348' into PHP-5.5

* bug49348:
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
news for bug #49348
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated lib versions
updated lib versions