projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64b65af 5dd6384)
Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Fri, 22 May 2009 12:35:54 +0000 (13:35 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 22 May 2009 12:35:54 +0000 (13:35 +0100)

Trivial merge