{"shas":[["062974b4dae386e9355080a9fe93f00b64d9db86","2a2f459ef12b4656e30deee4460f4b18c8be08b7@ephox.com","Merge branch 'master' into 3.4\n\nConflicts:\n\tjscripts/tiny_mce/classes/Formatter.js\n\tjscripts/tiny_mce/classes/dom/DOMUtils.js\n\tjscripts/tiny_mce/classes/dom/Selection.js\n\tjscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js\n\tjscripts/tiny_mce/themes/advanced/color_picker.htm\n\tjscripts/tiny_mce/tiny_mce_popup.js\n\ttests/basic.html\n\ttests/index.html\n\ttests/lists_applying.html\n\ttests/tinymce.Formatter_apply.html","Rob Dawson"]],"repo":"ephox/tinymce","actor":"rojotek","ref":"refs/heads/3.4","size":1,"head":"062974b4dae386e9355080a9fe93f00b64d9db86","actor_gravatar":"b3e9e3c5a34016519021b9a224abe612","push_id":26723845}