144 commits

Author	SHA1	Message	Date
kervala	db718f9a40	Merge with develop	2016-09-23 13:32:12 +02:00
Nimetu	e146348e03	Merge with develop	2016-09-21 20:12:51 +03:00
kervala	2455fc02d7	Merge with develop	2016-09-19 14:52:47 +02:00
kervala	e68258e56e	Merge with develop	2016-09-16 19:25:17 +02:00
kervala	89ab635693	Merge with develop	2016-09-12 14:39:38 +02:00
kervala	8c0af53b48	Merge with develop	2016-09-03 10:15:39 +02:00
Nimetu	3610c6c8cb	Merge with develop	2016-08-30 21:27:56 +03:00
kervala	8af64c9e71	Merge with develop	2016-08-06 20:12:39 +02:00
Nimetu	70aa8676c2	Merge with develop	2016-07-25 19:27:04 +03:00
Nimetu	85838aec19	Merge with develop	2016-07-24 16:09:25 +03:00
Nimetu	0be0a1e9e7	Merge with develop	2016-07-23 11:28:22 +03:00
kervala	120d2d7dba	Merge with develop	2016-06-26 19:43:53 +02:00
Nimetu	975ed523be	Merge with develop	2016-06-25 22:30:51 +03: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	41ef412c0c	Merge with develop	2016-06-16 17:16:27 +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
Nimetu	8f9d7078bd	Merge with develop	2016-06-12 12:49:14 +03:00
kervala	a096a9ccff	Merge with develop	2016-06-07 20:01:47 +02:00
kervala	d5b086b0c8	Merge with develop	2016-06-04 17:05:41 +02:00
Nimetu	dca7c1f40b	Merge with develop	2016-06-04 10:36:21 +03:00
kervala	d6fc8af573	Merge with develop	2016-05-30 17:51:54 +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
Nimetu	13bef3b94d	Merge with develop	2016-05-14 13:47:03 +03:00
kervala	673fb8d52a	Merge with develop	2016-05-13 20:55:24 +02:00
Nimetu	8c7086fa9d	Merge with develop	2016-05-13 13:58:33 +03:00
Nimetu	932acf2e11	Merge with develop	2016-05-09 20:14:15 +03:00
kervala	7bcf3bfe5c	Merge with develop	2016-05-08 19:24:04 +02:00
kervala	bf79b16b5b	Merge with develop	2016-05-08 13:42:53 +02:00
Nimetu	3530beb7fe	Merge with develop	2016-05-05 15:01:10 +03:00
Nimetu	a26d4063f7	Merge with develop	2016-04-23 18:49:52 +03:00
kervala	77927a2558	Merge with develop	2016-04-15 16:12:32 +02:00
kervala	9c3dc650e7	Backed out changeset: 44cd3beacab6	2016-04-14 18:56:48 +02:00
kervala	45565e2bb8	Changed: Temporary checks for a OS X 10.7 bug...	2016-04-14 18:19:19 +02:00
kervala	910c6dc7b9	Merge with develop	2016-04-12 15:43:47 +02:00
kervala	208e02b31e	Merge with develop	2016-04-06 09:34:34 +02:00
kervala	587804cab7	Merge with develop	2016-04-02 13:32:28 +02:00
kervala	e29d08861d	Merge with develop	2016-04-02 11:34:39 +02:00
kervala	2d5cf29861	Merge with develop	2016-03-20 17:28:00 +01:00
kaetemi	4bdca3e82e	Merge with develop	2016-03-19 22:34:32 +01:00
kervala	5109ae5443	Merge with develop	2016-03-19 19:30:06 +01:00
kervala	dc52b3e24f	Merge with develop	2016-03-19 16:21:46 +01:00
kervala	371cba9a84	Merge with develop	2016-03-18 22:27:43 +01:00
kervala	63b2843232	Merge with develop	2016-03-18 22:16:28 +01:00
kervala	f192068bc4	Merge with develop	2016-03-16 19:15:11 +01:00
kervala	0e1cbe909c	Merge with develop	2016-03-15 12:37:11 +01:00
kaetemi	4eb9d884d0	Merge with develop	2016-03-10 12:09:18 +01:00
kaetemi	eb8835c36c	Merge with develop	2016-03-08 12:46:47 +01:00