Melanie 96539ffc79 Merge branch 'master' into bigmerge ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs		2011-12-08 18:29:19 +00:00
..
Clients	Added missing "Old Guids=true" to ConnectionString	2011-06-10 21:10:37 +01:00
Common	Merge branch 'master' into bigmerge	2011-12-08 18:29:19 +00:00
ConfigurationLoaderTest.cs	Shell Environment Variables in config	2011-11-23 10:11:47 -05:00