oversu/fRO_french_translation_rAthena

Autors	SHA1 Ziņojums	Datums
ultramage	ab77ae1f2b Partially reverted r13197 to maintain consistency with followup sql update.	16 gadi atpakaļ
zephyrus	d475f7aaff - Removed mer_id from main.sql in char table. (Bug Report 2192)	16 gadi atpakaļ
zephyrus	e5e14c14fe - Added column `mer_id` on char_db	17 gadi atpakaļ