Melanie 72c925a6c9 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/Physics/OdePlugin/OdeScene.cs

2012-10-18 20:56:34 +01:00

..

Interfaces

Merge branch 'master' into careminster

2012-10-07 02:48:28 +01:00

Scenes

Merge branch 'avination' into careminster

2012-10-18 20:56:34 +01:00

ModuleLoader.cs

Merge branch 'master' into careminster-presence-refactor

2011-04-12 00:27:39 +01:00