8 commits

Author	SHA1	Message	Date
kervala	4cdd6c845f	Merge with develop	2016-11-26 16:17:04 +01:00
kervala	4bf0e1b0d9	Merge with develop	2016-11-25 10:44:44 +01:00
kervala	323f6bd83a	Merge with develop	2016-11-20 14:55:21 +01:00
kervala	4d96978674	Merge with develop	2016-11-20 14:51:11 +01:00
kervala	0cfd8cb35d	Merge with develop	2016-10-27 16:48:45 +02:00
kervala	d078103453	Merge with develop	2016-10-21 16:50:04 +02:00
kervala	52678ea899	Merge with develop	2016-10-20 13:55:34 +02:00
kervala	4c51c4e68c	Merge with develop	2016-09-24 14:22:22 +02:00