4 commits

Author	SHA1	Message	Date
Nimetu	dee80dc90e	Merge with develop	2016-08-25 22:18:35 +03:00
kervala	a3b8a2749e	Merge with develop	2016-07-09 13:48:03 +02:00
kervala	7df642535b	Merge with develop	2016-07-01 10:42:21 +02:00
kervala	ed03eb0a02	Merge with develop	2016-05-24 11:25:04 +02:00