Merge with 0.6
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Feb 2010 18:03:15 +0000 (18:03 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 25 Feb 2010 18:03:15 +0000 (18:03 +0000)
commit095d291f5356ff2450c11608fda6bdabc4286f91
treebe497eac0112a25fcbcb24ce405f13bad83a5538
parent2bd8ab4b90ed7a45a2fdbf9216290f52b36b64e7
parentd7e4bd252e206f468be01534cfbc7130386cfc4f
Merge with 0.6
core/s2smanager.lua
plugins/mod_offline.lua
prosody