Files
opensim/bin
Melanie 2f365ea80b Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2013-09-07 13:54:19 +01:00
..
2013-08-24 03:40:44 -07:00
2013-04-22 22:58:33 +02:00
2013-06-04 21:11:16 +01:00
2012-12-13 00:05:34 -05:00
2012-12-13 00:05:34 -05:00