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

projects / prosody.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 67b9e1c 1881612)

author	Matthew Wild <mwild1@gmail.com>
	Thu, 2 Jun 2011 14:28:12 +0000 (15:28 +0100)
committer	Matthew Wild <mwild1@gmail.com>
	Thu, 2 Jun 2011 14:28:12 +0000 (15:28 +0100)
commit	c269396a37a8bef1b71982f2cdd336324eb72d07
tree	83d9378ef256c4b625174e10babdc3c04fdf442d	tree \| snapshot
parent	67b9e1cb209dd96e916fcb9c3e7c0afa5f05225e	commit \| diff
parent	1881612f6e77c771984d73b85704e89818a82977	commit \| diff

Merge 0.7->0.8

15 files changed:

certs/openssl.cnf	diff1 \|	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	diff1 \|	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
util/xmppstream.lua	diff1 \|	diff2 \|	blob \| history