projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 274b32c b581697)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Tue, 16 Feb 2010 17:16:12 +0000 (17:16 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 16 Feb 2010 17:16:12 +0000 (17:16 +0000)

Trivial merge