projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee85d0c d8be5b0)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Wed, 22 Jul 2009 20:35:58 +0000 (21:35 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 22 Jul 2009 20:35:58 +0000 (21:35 +0100)

Trivial merge