38 commits

Author	SHA1	Message	Date
kervala	c82b04b597	Merge with develop	2016-09-20 18:36:02 +02:00
kervala	61a3bc0c9a	Merge with develop	2016-09-20 17:51:27 +02:00
kervala	2455fc02d7	Merge with develop	2016-09-19 14:52:47 +02:00
kervala	5fc7c25be4	Merge with develop	2016-09-18 16:35:01 +02:00
kervala	e68258e56e	Merge with develop	2016-09-16 19:25:17 +02:00
kervala	16598659b5	Merge with develop	2016-09-16 19:00:32 +02:00
kervala	30ad6fa760	Merge with develop	2016-09-14 08:18:14 +02:00
kervala	8c0af53b48	Merge with develop	2016-09-03 10:15:39 +02:00
kervala	0b4f365d60	Merge with develop	2016-08-16 18:27:42 +02:00
kervala	80275386ec	Merge with develop	2016-08-14 13:36:44 +02:00
kervala	5ea8a69890	Changed: Only enable Atys at first	2016-08-13 15:53:49 +02:00
kervala	8af64c9e71	Merge with develop	2016-08-06 20:12:39 +02:00
kervala	87df259f07	Merge with develop	2016-07-27 12:44:09 +02:00
kervala	7ce529452f	Merge with develop	2016-07-26 18:23:35 +02:00
kervala	f81a367111	Merge with develop	2016-07-25 18:58:02 +02:00
kervala	ec1e27acca	Merge with develop	2016-06-27 11:51:59 +02:00
kervala	120d2d7dba	Merge with develop	2016-06-26 19:43:53 +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	2275e55db9	Merge with develop	2016-06-07 13:32:06 +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	ac448eac18	Merge with develop	2016-05-27 22:24:20 +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	0c2cdd108e	Merge with develop	2016-05-17 20:50:14 +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	00e99132c7	Merge with develop	2016-05-16 18:20:14 +02:00
kervala	16ce9a7964	Merge with develop	2016-05-16 18:17:40 +02:00
kervala	cd89e4c348	Merge with develop	2016-05-16 16:50:11 +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
kervala	294bf10666	Merge with develop	2016-05-14 18:55:54 +02:00