4 commits

Author	SHA1	Message	Date
kervala	87df259f07	Merge with develop	2016-07-27 12:44:09 +02:00
kervala	f81a367111	Merge with develop	2016-07-25 18:58:02 +02:00
kervala	0c2cdd108e	Merge with develop	2016-05-17 20:50:14 +02:00
kervala	294bf10666	Merge with develop	2016-05-14 18:55:54 +02:00