4 commits

Author	SHA1	Message	Date
kervala	87df259f07	Merge with develop	2016-07-27 12:44:09 +02:00
kervala	0766c4766f	Merge with develop	2016-05-17 11:02:02 +02:00
kervala	3b4b071839	Merge with develop	2016-05-16 20:33:43 +02:00
kervala	294bf10666	Merge with develop	2016-05-14 18:55:54 +02:00