Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-11-21 23:47:28 +00:00
14 changed files with 328 additions and 766 deletions

View File

@@ -35,5 +35,6 @@ namespace OpenSim.Services.Interfaces
{
Hashtable HandleDirectoryRequest(Hashtable requestBody);
Hashtable HandleDialplanRequest(Hashtable requestBody);
string GetJsonConfig();
}
}