3 commits

Author	SHA1	Message	Date
Nimetu	94d2d95efa	Merge with develop	2016-03-01 22:39:10 +02:00
Nimetu	30454c9ef5	Merge with develop	2016-02-13 17:36:57 +02:00
kervala	198759a880	Fixed: Use same XML files as on Atys	2016-01-24 17:08:32 +01:00