projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38cec3f 9dfe9a8)
Merge roster fixes from waqas
authorMatthew Wild <mwild1@gmail.com>
Wed, 8 Oct 2008 16:27:20 +0000 (17:27 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 8 Oct 2008 16:27:20 +0000 (17:27 +0100)

Trivial merge