Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

1
tinyMCE.addI18n('eu.paste_dlg',{"word_title":"Erabili CTRL+V testua lehioan itsasteko.","text_linebreaks":"Mantendu lerro-jauziak","text_title":"Erabili CTRL+V testua lehioan itsasteko."});