git.enpas.org Git - prosody.git/commit

projects / prosody.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ec33912 bc1374c)

author	Matthew Wild <mwild1@gmail.com>
	Wed, 1 Jun 2011 22:26:39 +0000 (23:26 +0100)
committer	Matthew Wild <mwild1@gmail.com>
	Wed, 1 Jun 2011 22:26:39 +0000 (23:26 +0100)
commit	093e7bb084c42c8ec56cc94bbd51cff25f94664a
tree	40f5a953581c980caf49f65309b46c7b0644631e	tree \| snapshot
parent	ec33912360b3958cc27bfe74fa94583b066d9237	commit \| diff
parent	bc1374cd5504f95c9b7a1b3c95950753d414b105	commit \| diff

Merge 0.7->0.8

14 files changed:

certs/openssl.cnf	\|	diff2 \|	blob \| history
core/certmanager.lua	diff1 \|	diff2 \|	blob \| history
core/s2smanager.lua	diff1 \|	diff2 \|	blob \| history
core/sessionmanager.lua	diff1 \|	diff2 \|	blob \| history
net/dns.lua	diff1 \|	diff2 \|	blob \| history
net/server_select.lua	diff1 \|	diff2 \|	blob \| history
plugins/mod_admin_telnet.lua	\|	diff2 \|	blob \| history
plugins/mod_bosh.lua	diff1 \|	diff2 \|	blob \| history
plugins/mod_dialback.lua	diff1 \|	diff2 \|	blob \| history
plugins/mod_register.lua	diff1 \|	diff2 \|	blob \| history
plugins/mod_roster.lua	diff1 \|	diff2 \|	blob \| history
plugins/mod_saslauth.lua	diff1 \|	diff2 \|	blob \| history
plugins/muc/muc.lib.lua	diff1 \|	diff2 \|	blob \| history
util-src/encodings.c	diff1 \|	diff2 \|	blob \| history