15 commits

Author	SHA1	Message	Date
kervala	130847cac5	Merge with develop	2016-01-14 21:28:47 +01:00
kervala	6a5fc56ce0	Merge with develop	2016-01-13 20:05:06 +01:00
kervala	6c341fc348	Merge with develop	2016-01-11 10:09:58 +01:00
kervala	e0e990566c	Merge with develop	2016-01-09 16:32:59 +01:00
kervala	63a6f0f837	Merge with develop	2016-01-06 16:06:23 +01:00
kervala	d46d1e45ad	Merge with develop	2016-01-05 13:00:18 +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	83f8502b51	Merge with develop	2016-01-01 16:27:45 +01:00
kervala	8dda998ea5	Merged with develop	2015-12-25 20:52:18 +01:00
kervala	0a03d1c870	Merge with develop	2015-12-25 15:37:07 +01:00
kervala	d2676c3b57	Merge with develop	2015-12-23 15:31:37 +01:00
kervala	c09d7e6884	Merge with develop	2015-12-21 17:39:49 +01:00
kervala	5752e8a04b	Changed: Updated translations	2015-12-18 13:02:31 +01:00