Melanie
13cd8c17d7
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2013-05-11 02:35:26 +01:00
..
2010-06-08 15:47:14 -07:00
2010-05-16 17:04:13 +03:00
2010-10-30 19:06:47 +01:00
2013-05-11 01:27:37 +01:00
2011-06-11 09:36:57 -07:00
2012-01-30 20:34:32 +00:00
2012-09-27 16:43:18 -07:00
2013-02-19 06:37:20 -08:00
2010-11-21 17:19:24 -08:00
2010-05-16 17:04:13 +03:00
2013-02-19 07:26:40 -08:00
2010-10-18 19:08:26 +01:00
2013-02-10 00:17:14 +00:00
2010-05-16 17:04:13 +03:00
2010-05-16 17:04:13 +03:00
2013-03-15 23:42:16 +00:00