Merge with Florob
authorMatthew Wild <mwild1@gmail.com>
Sat, 28 Jul 2012 00:14:31 +0000 (01:14 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 28 Jul 2012 00:14:31 +0000 (01:14 +0100)
commitea49e036fe722fbd3c4418518ea744d831d4ab31
tree8b6b74c6d84e2184ec7ab3cf23725f30ff7d0bca
parentbca1ffeb353cc332b6aac1445481d8247b9e4365
parentfb6ac63c6857928b6dcd8ec64db75a328226f3f5
Merge with Florob
core/moduleapi.lua
core/rostermanager.lua
plugins/mod_admin_telnet.lua
prosodyctl
util/datamanager.lua