projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e597263 71c67e3)
Merge with waqas for MUC/routing fixes
authorMatthew Wild <mwild1@gmail.com>
Wed, 11 Feb 2009 18:30:44 +0000 (18:30 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 11 Feb 2009 18:30:44 +0000 (18:30 +0000)

Trivial merge