5 commits

Author	SHA1	Message	Date
kervala	63984e4a2a	Merge with develop	2016-01-18 21:32:01 +01:00
kervala	19ab8294bb	Merge with develop	2016-01-17 13:24:01 +01:00
kervala	6995adfbc7	Merge with develop	2016-01-16 23:50:23 +01:00
kervala	8bda57bf89	Merge with develop	2016-01-16 15:58:19 +01:00
kervala	628c2b1d80	Merge with develop	2016-01-16 10:52:18 +01:00