• changeset
• raw
• zip
• gz

changeset

Merge 0.7->trunk

Mon, 07 Jun 2010 12:19:14 +0100

author

Matthew Wild <mwild1@gmail.com>

date

Mon, 07 Jun 2010 12:19:14 +0100

changeset 3188

d35b181a895a

parent 3184

1b076d237a20 (current diff)

parent 3187

f22248192c3e (diff)

child 3197

f1db45e89317

Merge 0.7->trunk

plugins/mod_presence.lua		file | annotate | diff | comparison | revisions
util/sasl/scram.lua		file | annotate | diff | comparison | revisions