projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b9f5dd a3264b2)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Wed, 5 Aug 2009 02:08:54 +0000 (03:08 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 5 Aug 2009 02:08:54 +0000 (03:08 +0100)

Trivial merge