5 commits

Author	SHA1	Message	Date
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	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
Nimetu	bf33ad683f	Merge with develop	2015-12-13 21:04:37 +02:00