Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-11-11 21:16:58 +00:00
4 changed files with 116 additions and 79 deletions

View File

@@ -1414,16 +1414,6 @@
; DeleteScriptsOnStartup = false
[OpenGridProtocol]
;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
;On/true or Off/false
ogp_enabled=false
;Name Prefix/suffix when using OGP
ogp_firstname_prefix=""
ogp_lastname_suffix="_EXTERNAL"
[Concierge]
; Enable concierge module
; Default is false