projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa08a1d 9a02720)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 21 May 2010 18:28:56 +0000 (19:28 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 21 May 2010 18:28:56 +0000 (19:28 +0100)

Trivial merge