# HG changeset patch
# User matthew@silver
# Date 1219597684 -3600
# Node ID 7ad47ce20394591af103679add3a18bb49a38a08
# Parent  57e4eb3aeac09a7c44f2ae921f60b61047f58c2f# Parent  09c3845ed442f8fdd157f1810fdd93ce54e946de
Merged 2 heads o_O

diff -r 57e4eb3aeac0 -r 7ad47ce20394 TODO
diff -r 57e4eb3aeac0 -r 7ad47ce20394 core/rostermanager.lua
diff -r 57e4eb3aeac0 -r 7ad47ce20394 core/stanza_dispatch.lua
diff -r 57e4eb3aeac0 -r 7ad47ce20394 main.lua
diff -r 57e4eb3aeac0 -r 7ad47ce20394 util/stanza.lua