6 commits

Author	SHA1	Message	Date
kervala	c4f5512b24	Merge with develop	2016-05-29 20:38:55 +02:00
kervala	6fbf8c5326	Merge with develop	2016-05-26 19:36:25 +02:00
kervala	0c2cdd108e	Merge with develop	2016-05-17 20:50:14 +02:00
kervala	9a61bd9a7c	Merge with develop	2016-05-16 16:31:30 +02:00
kervala	b85c2753a8	Merge with develop	2016-05-16 11:13:45 +02:00
kervala	294bf10666	Merge with develop	2016-05-14 18:55:54 +02:00