Merge 0.6->0.7
authorWaqas Hussain <waqas20@gmail.com>
Thu, 6 May 2010 11:25:40 +0000 (16:25 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 6 May 2010 11:25:40 +0000 (16:25 +0500)
commitf672c8647e3ad1a808c412e8d37ee10fe5122ab2
tree3359c15d921c3a5d619dd918850ff942d429a3a7
parente5502a8b2f224afa786e5a7fcdc233d5e15a85d7
parentaaf015700321f46a286bebd1e163c89dd419d61c
Merge 0.6->0.7
core/configmanager.lua
net/server_select.lua
plugins/muc/muc.lib.lua
prosody