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
..
2009-05-20 01:32:06 +00:00
2010-06-28 04:02:33 -07:00
2012-11-24 02:43:31 +00:00
2012-08-15 02:06:22 +01:00
2013-02-28 20:57:03 +00:00
2013-05-11 02:35:26 +01:00
2013-03-06 23:06:00 +00:00
2010-09-16 20:46:24 +01:00
2013-03-14 22:56:26 +00:00
2011-12-05 21:04:17 +00:00
2011-12-05 20:44:20 +00:00
2013-02-06 02:21:17 +00:00
2013-05-09 22:48:10 +01:00