Merge 0.6->0.7
authorMatthew Wild <mwild1@gmail.com>
Wed, 24 Mar 2010 22:34:59 +0000 (22:34 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 24 Mar 2010 22:34:59 +0000 (22:34 +0000)
commit332edec7b662736cd8acac68ebdeeae6dc7a53c2
tree1b7ad995319808a0b1fe9760f8aa079ff570dc8a
parent2fefeb2d73fd5c6ef132e078caee360d35beba94
parentbf329663799a0d4a858d3d328d07ab384aa91cc5
Merge 0.6->0.7
plugins/mod_tls.lua
plugins/muc/muc.lib.lua
prosody