Fixed identation on file
Bug 64744
Show the type of the non-object for more descriptive errors
Allow crypto_method context value in stream_socket_enable_crypto()
put this test back to XFAIL, as it was before, since it is still leaking memory
separate travis jobs for TS and NTS builds
separate travis jobs for debug and non-debug builds
Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
Merge remote-tracking branch 'tyrael/more_travis' into PHP-5.5

* tyrael/more_travis:
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

* origin/PHP-5.5:
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory

Conflicts:
	ext/mbstring/tests/zend_multibyte-08.phpt
Merge remote-tracking branch 'origin/PHP-5.6'

* origin/PHP-5.6:
  Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
BFN
Merge branch 'PHP-5.6'

* PHP-5.6:
  BFN
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
fix test locality inconsitency
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test locality inconsitency
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test locality inconsitency
add some missing NEWS entries
Merge branch 'PHP-5.6'

* PHP-5.6:
  add some missing NEWS entries
add missing NEWS entry to the correct release where it was added