7 commits

Author	SHA1	Message	Date
kervala	83f8502b51	Merge with develop	2016-01-01 16:27:45 +01:00
kervala	1454a3bc67	Merge with develop	2015-12-29 18:03:21 +01:00
kervala	965971a86d	Merge with develop	2015-12-28 18:21:56 +01:00
kervala	de1519f50b	Merge with develop	2015-12-28 16:44:35 +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