4 commits

Author	SHA1	Message	Date
kervala	8cc8e6bea0	Merge with develop	2015-12-15 18:46:51 +01:00
kervala	5f05b0db94	Merge with develop	2015-12-15 18:29:39 +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