7 commits

Author	SHA1	Message	Date
kervala	172e8ef65c	Merge with develop	2015-12-13 15:26:37 +01:00
kervala	27da1e0e64	Merge with develop	2015-12-08 17:50:01 +01:00
kervala	e1d0fca6e0	Merge with develop	2015-12-06 19:44:27 +01:00
kervala	e6aa5562d6	Merge with develop	2015-12-06 16:56:53 +01:00
kervala	dc7df29d2b	Merge with develop	2015-11-29 17:55:33 +01:00
kervala	3712c43a17	Merge with develop	2015-03-07 17:03:34 +01:00
kervala	ab5b83347c	Create compatibility-develop branch	2015-03-07 17:01:14 +01:00