projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18c53f6 ddeee1e)
Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Fri, 1 May 2009 22:29:40 +0000 (23:29 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 1 May 2009 22:29:40 +0000 (23:29 +0100)

Trivial merge