# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1275909554 -3600
# Node ID d35b181a895a8256357adc0cd428b2d631b47a7e
# Parent  1b076d237a203114c2ef5b36a937bc79ff9c0c40# Parent  f22248192c3eb22a496b91bda2a8d1b59dadd4bd
Merge 0.7->trunk

diff -r 1b076d237a20 -r d35b181a895a plugins/mod_presence.lua
diff -r 1b076d237a20 -r d35b181a895a util/sasl/scram.lua