Automated merge.
-rw-r--r-- 192 AUTHORS
-rw-r--r-- 18128 COPYING
-rw-r--r-- 134 DEPENDS
-rw-r--r-- 393 HACKERS
-rw-r--r-- 1409 Makefile
-rw-r--r-- 125 TODO
drwxr-xr-x - certs
-rwxr-xr-x 5461 configure
drwxr-xr-x - core
drwxr-xr-x - doc
drwxr-xr-x - net
drwxr-xr-x - plugins
-rwxr-xr-x 4035 prosody
-rw-r--r-- 3024 prosody.cfg.lua.dist
drwxr-xr-x - tests
drwxr-xr-x - tools
drwxr-xr-x - util-src
drwxr-xr-x - util