Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)

Conflicts:
	NEWS
	Zend/zend_compile.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Fixed bug #62343 (Show class_alias In get_declared_classes())
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62343 (Show class_alias In get_declared_classes())
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #62343 (Show class_alias In get_declared_classes())

Conflicts:
	NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #62343 (Show class_alias In get_declared_classes())
Partial fix for bug #64239
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Partial fix for bug #64239
Merge branch 'PHP-5.5'

* PHP-5.5:
  Partial fix for bug #64239
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)

Conflicts:
	NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)
fix C90 compat
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix C90 compat
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix C90 compat
Fix #48358 add() method for SplDoublyLinkedLis
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix #48358 add() method for SplDoublyLinkedLis
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5