alohaeditor/Aloha-Editor — pull request #702 by peponesound (2012-08-24 07:38:02+00:00)
Title: changed loading procedure of languages in wai lang plugin from AJAX to r...

...equire.js

Conflicts:

src/plugins/extra/wai-lang/lib/iso639-1-de.json
src/plugins/extra/wai-lang/lib/iso639-1-en.json
src/plugins/extra/wai-lang/lib/iso639-2-de.json
src/plugins/extra/wai-lang/lib/iso639-2-en.json