projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4be04da 6060b4a)
Merge 0.8 -> trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 5 Apr 2011 13:38:08 +0000 (14:38 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 5 Apr 2011 13:38:08 +0000 (14:38 +0100)

Trivial merge