7 commits

Author	SHA1	Message	Date
kervala	63984e4a2a	Merge with develop	2016-01-18 21:32:01 +01:00
kervala	a6694d122b	Merge with develop	2016-01-04 14:03:11 +01:00
kervala	a046a06db3	Merge with develop	2016-01-03 18:16:07 +01:00
kervala	50b846d56c	Merge with develop	2016-01-02 22:36:05 +01:00
kervala	8dda998ea5	Merged with develop	2015-12-25 20:52:18 +01:00
kervala	d2676c3b57	Merge with develop	2015-12-23 15:31:37 +01:00
kervala	5752e8a04b	Changed: Updated translations	2015-12-18 13:02:31 +01:00