4 commits

Author	SHA1	Message	Date
kervala	3ae8a19af1	Merge with develop	2016-06-12 15:44:48 +02:00
kervala	e3c977ee57	Merge with develop	2016-06-11 17:06:08 +02:00
kervala	c4f5512b24	Merge with develop	2016-05-29 20:38:55 +02:00
kervala	294bf10666	Merge with develop	2016-05-14 18:55:54 +02:00