Fix #66021 (Blank line inside empty array/object)

Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified,
the pair of linefeeds immediately after an opening bracket and before the
corresponding closing bracket is omitted when the array or object contains no
elements or accessible properties (and hence would have a blank line between
the brackets).
add vc12 (2013)
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.5' of git.php.net:php-src:
  Fixed coredump due to abnormal implemention of phar
  remove "PHP 6" staff
add vc12 (2013)
fix test bug62479.phpt
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test bug62479.phpt
Fixed bug #45543: DateTime::setTimezone can not set timezones without ID.
Merge branch '45543-timezone-set' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
fix test
XFAIL multibyte tests until they are fixed (bug 66582)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  XFAIL multibyte tests until they are fixed (bug 66582)
drop precision since trigonometric functions are non-portable

See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)
drop precision since trigonometric functions are non-portable

See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  drop precision since trigonometric functions are non-portable
  XFAIL multibyte tests until they are fixed (bug 66582)
Update source docs
Revert "Update source docs"

This reverts commit 10d06cd4ff3038d2f02a18936793969e7aee0bda.
Update source docs