KoffeinFlummi 761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
..
2015-03-14 12:05:43 +01:00
2015-03-18 13:36:22 +01:00
2015-04-28 15:40:36 -05:00
2015-03-24 21:37:27 +01:00