# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1275909717 -3600
# Node ID f1db45e89317c0bb3e5109e01f5b545b06d593a1
# Parent  d35b181a895a8256357adc0cd428b2d631b47a7e# Parent  8ad50989d79e79dc930ee085e73388fb45d8c559
Merge trunk/MattJ->trunk

diff -r 8ad50989d79e -r f1db45e89317 plugins/mod_presence.lua
diff -r 8ad50989d79e -r f1db45e89317 util/sasl/scram.lua