Merge 0.6->0.7
authorMatthew Wild <mwild1@gmail.com>
Fri, 9 Apr 2010 11:31:51 +0000 (12:31 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 9 Apr 2010 11:31:51 +0000 (12:31 +0100)
commit2af29f76660589a0c33d879fbff6faa6c5979da8
tree20437624acab1a59bb79fdc1a95c76112c438802
parent8516cf1528ebeb0f6c3957ae0c24958c82383ffe
parent182a6bf469141c857a390e7661f77f038f2176f2
Merge 0.6->0.7
core/loggingmanager.lua
net/server_select.lua
plugins/muc/muc.lib.lua
prosody