4 commits

Author	SHA1	Message	Date
Nimetu	588d1ca8ce	Merge with develop	2015-12-18 14:34:48 +02:00
kervala	46b82be25e	Merge with develop	2015-12-15 15:09:50 +01:00
Nimetu	752f45f25b	Merge with develop	2015-12-15 12:27:11 +02:00
Nimetu	bf33ad683f	Merge with develop	2015-12-13 21:04:37 +02:00