Merge 0.6 into 0.7.
authorWaqas Hussain <waqas20@gmail.com>
Sat, 1 May 2010 00:18:38 +0000 (05:18 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Sat, 1 May 2010 00:18:38 +0000 (05:18 +0500)
commit721586aa7b25dc9e9ff0f045c329e226aeba7ba8
tree324305c99f8eae9ba2fba3cd685993d269e73b3a
parentff709f2f9ab120908124af56d06f6e09eb26ccd3
parent484a90b035535576d92c4f26698635daa1cb6708
Merge 0.6 into 0.7.
core/configmanager.lua
core/hostmanager.lua
core/loggingmanager.lua
plugins/muc/muc.lib.lua
prosody.cfg.lua.dist