projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 297920f 696f325)
Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Thu, 21 May 2009 15:09:15 +0000 (16:09 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 21 May 2009 15:09:15 +0000 (16:09 +0100)

Trivial merge