Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

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