projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3421574 3178b6d)
Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Wed, 6 May 2009 20:45:25 +0000 (21:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 6 May 2009 20:45:25 +0000 (21:45 +0100)

Trivial merge