projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13cf498 863f00a)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Tue, 13 Oct 2009 10:13:52 +0000 (11:13 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 13 Oct 2009 10:13:52 +0000 (11:13 +0100)

Trivial merge