Tags: GuoYingxu/tinymce

reenable fixed tests

update changelog date

Merge pull request tinymce#397 in TINYMCE/tinymce from TINY-1312 to m…

…aster

* commit 'f0a9c62c653d2b12615b0de28aa423e932169c69':
  TINY-1312: Updated changelog and version number

Merge pull request tinymce#388 in TINYMCE/tinymce from TINY-1287 to 4…

….5.x

* commit 'f81d69084d334037b781cc528218e45ea1de48df':
  TINY-1287: fixed whitespace issue
  TINY-1287: updated changelog and bumped version

Merge pull request tinymce#379 in TINYMCE/tinymce from TINY-1260 to m…

…aster

* commit 'b4ed1cd5078539f81be69428aea4d0590b9e1162':
  TINY-1260: updated changelog

Merge pull request tinymce#364 in TINYMCE/tinymce from TINY-1233 to m…

…aster

* commit 'ba60a2338f09885d605771493b7238d4a6485529':
  TINY-1233: review fixes
  TINY-1233: update changelog and package.json for 4.6.7 release

Merge pull request tinymce#343 in TINYMCE/tinymce from TINY-1204 to m…

…aster

* commit '5b93901988709da4c4bacbd4040a0948f55edb51':
  TINY-1204: added one more fix
  TINY-1204: review fixes, typos and package.json bump
  TINY-1204: updated changelog for 4.6.6 release

Merge pull request tinymce#313 in TINYMCE/tinymce from TINY-1182 to m…

…aster

* commit '36e4c6b0edc8cdbe7e4e82da395cdbb8afa1fa5c':
  TINY-1182: updated changelog
  TINY-1182: updated changelog
  TINY-1182: updated changelog

fixed odd phatomjs test failure

fixed eslint issue