Remove merge conflict

Thomas Bruederli

2014-01-16 25a244908b21b097f744c7194e4862ca6ebda391

1
tinyMCE.addI18n('id.paste_dlg',{"word_title":"Gunakan CTRL+V pada keyboard untuk paste.","text_linebreaks":"Keep linebreaks","text_title":"Gunakan CTRL+V pada keyboard untuk paste."});