Melanie eb9458fd7e Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs		2013-02-28 21:20:07 +00:00
..
Interfaces	Merge branch 'master' into careminster	2013-02-27 18:05:04 +00:00
Properties	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
Scenes	Merge branch 'master' into careminster	2013-02-28 21:20:07 +00:00