Melanie 69054ad134 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs		2013-10-06 18:32:20 +01:00
..
Interfaces	Update SmartThreadPool to latest version 2.2.3 with a major and minor change.	2013-05-01 19:01:43 +01:00
Shared	Merge branch 'master' into careminster	2013-10-06 18:32:20 +01:00
XEngine	Merge branch 'master' into careminster	2013-10-06 18:32:20 +01:00