Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

This commit is contained in:
Melanie
2013-10-06 18:33:49 +01:00
6 changed files with 34 additions and 6 deletions

View File

@@ -1241,4 +1241,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
return null;
}
}
}
}