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

cmcnulty

2013-11-04 5a870688b082ec958c99a757139dd2e26b1f8233

1
tinyMCE.addI18n('nb.paste_dlg',{"word_title":"Bruk CTRL+V p\u00e5 tastaturet for \u00e5 lime inn i dette vinduet.","text_linebreaks":"Behold tekstbryting","text_title":"Bruk CTRL+V p\u00e5 tastaturet for \u00e5 lime inn i dette vinduet."});