8 commits

Author	SHA1	Message	Date
kervala	1354d99609	Merge with develop	2016-01-02 17:11:59 +01:00
kervala	83f8502b51	Merge with develop	2016-01-01 16:27:45 +01:00
kervala	3b71e02577	Merge with develop	2015-12-30 00:46:50 +01:00
kervala	4f24898102	Merge with develop	2015-12-29 22:36:04 +01:00
kervala	1454a3bc67	Merge with develop	2015-12-29 18:03:21 +01:00
kervala	d2676c3b57	Merge with develop	2015-12-23 15:31:37 +01:00
kervala	fa19cb0f6d	Merge with develop	2015-12-18 18:07:11 +01:00
kervala	5752e8a04b	Changed: Updated translations	2015-12-18 13:02:31 +01:00