7 commits

Author	SHA1	Message	Date
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