14 commits

Author	SHA1	Message	Date
kervala	cde1975f25	Merge with develop	2015-12-26 18:00:04 +01:00
kervala	ce91dc1cf8	Merge with develop	2015-12-26 15:13:08 +01:00
kervala	f66c15c5da	Merge with develop	2015-12-26 14:38:37 +01:00
kervala	8dda998ea5	Merged with develop	2015-12-25 20:52:18 +01:00
kervala	0a03d1c870	Merge with develop	2015-12-25 15:37:07 +01:00
kervala	d2676c3b57	Merge with develop	2015-12-23 15:31:37 +01:00
Nimetu	0f44e01d18	Merge with develop	2015-12-22 01:30:11 +02:00
Nimetu	03242fbc41	Merge with develop	2015-12-20 03:34:00 +02:00
Nimetu	2c94ec2e2d	Merge with develop	2015-12-19 20:40:05 +02:00
Nimetu	588d1ca8ce	Merge with develop	2015-12-18 14:34:48 +02:00
kervala	b8505bd7df	Merge with develop	2015-12-17 13:04:56 +01:00
kervala	02942741e6	Merge with develop	2015-12-16 14:51:18 +01:00
kervala	46b82be25e	Merge with develop	2015-12-15 15:09:50 +01:00
Nimetu	bf33ad683f	Merge with develop	2015-12-13 21:04:37 +02:00