projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 425f13a f0e43aa)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 22:09:59 +0000 (23:09 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 22:09:59 +0000 (23:09 +0100)

Trivial merge