projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca98ed8 d399a0e)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 11:59:05 +0000 (11:59 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 11:59:05 +0000 (11:59 +0000)

Trivial merge