jonpas 03f26fc12b Merge branch 'master' into uiSettings
Conflicts:
	addons/ui/README.md
	addons/ui/RscChat.hpp
	addons/ui/config.cpp
2015-10-08 00:06:41 +02:00
..