projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d88ad5 0292be8)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Tue, 14 Jul 2009 16:09:43 +0000 (17:09 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 14 Jul 2009 16:09:43 +0000 (17:09 +0100)

Trivial merge