Melanie 389077345f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs

2012-11-11 16:31:01 +00:00

..

Tests

Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.

2012-08-20 20:24:54 +01:00

EventQueueGetModule.cs

Merge branch 'master' into careminster

2012-11-11 16:31:01 +00:00

EventQueueHelper.cs

bug fix

2012-09-04 10:51:43 +01:00