8 commits

Author	SHA1	Message	Date
kervala	628c2b1d80	Merge with develop	2016-01-16 10:52:18 +01:00
kervala	6a5fc56ce0	Merge with develop	2016-01-13 20:05:06 +01:00
kervala	d46d1e45ad	Merge with develop	2016-01-05 13:00:18 +01:00
kervala	6611f6ef07	Merge with develop	2015-12-30 00:14:27 +01:00
kervala	e8c6fd67db	Merge with develop	2015-12-30 00:10:51 +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	5752e8a04b	Changed: Updated translations	2015-12-18 13:02:31 +01:00