9 commits

Author	SHA1	Message	Date
kervala	98066af393	Merge with develop	2016-10-03 17:22:46 +02:00
kervala	329402c1cf	Merge with develop	2016-10-03 10:02:06 +02:00
kervala	6b24cd95d0	Merge with develop	2016-10-01 14:11:10 +02:00
kervala	4fc06a0c63	Merge with develop	2016-10-01 13:10:05 +02:00
kervala	f888b9f3bf	Merge with develop	2016-09-29 20:47:46 +02:00
kervala	f983a551a2	Merge with develop	2016-09-29 17:08:03 +02:00
kervala	6744ded402	Merge with develop	2016-09-28 23:55:21 +02:00
kervala	1fa75e0c6d	Merge with develop	2016-09-28 12:25:45 +02:00
kervala	4c51c4e68c	Merge with develop	2016-09-24 14:22:22 +02:00