13 commits

Author	SHA1	Message	Date
kervala	30ad6fa760	Merge with develop	2016-09-14 08:18:14 +02:00
kervala	ad98793560	Merge with develop	2016-06-19 21:10:23 +02:00
kervala	f54109d279	Merge with develop	2016-06-18 22:41:12 +02:00
kervala	e22cc2acf2	Merge with develop	2016-06-14 20:18:10 +02:00
kervala	3ae8a19af1	Merge with develop	2016-06-12 15:44:48 +02:00
kervala	e3c977ee57	Merge with develop	2016-06-11 17:06:08 +02:00
kervala	db686dc05c	Merge with develop	2016-06-04 20:11:55 +02:00
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	1656e82303	Merge with develop	2016-05-18 14:31:14 +02:00
kervala	9340cb4449	Merge with develop	2016-05-18 09:57:33 +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