6 commits

Author	SHA1	Message	Date
kervala	35b59843cf	Merge with develop	2016-10-10 18:55:28 +02:00
kervala	8fd439eb34	Merge with develop	2016-10-01 18:43:48 +02:00
kervala	6744ded402	Merge with develop	2016-09-28 23:55:21 +02:00
kervala	c1439da922	Merge with develop	2016-09-25 10:50:38 +02:00
kervala	e1555f9e24	Merge with develop	2016-09-24 15:54:47 +02:00
kervala	4c51c4e68c	Merge with develop	2016-09-24 14:22:22 +02:00