projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2349d61 1e5eeae)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 04:42:01 +0000 (04:42 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 04:42:01 +0000 (04:42 +0000)

Trivial merge