projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2af29f7 97cae61)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 9 Apr 2010 11:32:25 +0000 (12:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 9 Apr 2010 11:32:25 +0000 (12:32 +0100)

Trivial merge