5 commits

Author	SHA1	Message	Date
kervala	80275386ec	Merge with develop	2016-08-14 13:36:44 +02:00
kervala	ad98793560	Merge with develop	2016-06-19 21:10:23 +02:00
kervala	3ae8a19af1	Merge with develop	2016-06-12 15:44:48 +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