Merge remote-tracking branch 'upstream/master' into row-focus

cmcnulty

2013-11-04 5a870688b082ec958c99a757139dd2e26b1f8233

1
2
3
tinyMCE.addI18n('en.example',{ 
    desc : 'This is just a template button' 
});