projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68d82f0 5440573)
Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Tue, 19 May 2009 12:07:13 +0000 (13:07 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 19 May 2009 12:07:13 +0000 (13:07 +0100)

Trivial merge