updated libmagic.patch
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch
updated libmagic.patch
Switch from a single flag to a flag byte
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

# By Anatol Belski (2) and others
# Via Anatol Belski (3) and others
* 'PHP-5.6' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

# By Anatol Belski (1) and others
# Via Anatol Belski
* 'PHP-5.5' of git.php.net:php-src:
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
DI
updated libsqlite to 3.8.3.1 in 5.5 branch, too
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
  updated libmagic.patch
  updated libmagic.patch
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
  add vc12 (2013)

Conflicts:
	Zend/zend_ini_scanner.c
	Zend/zend_language_scanner.c
	ext/mysqlnd/mysqlnd_structs.h
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
  updated libmagic.patch
  updated libmagic.patch

Conflicts:
	Zend/zend_language_scanner.c
no need to fetch ts id here