projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cff7c1f 9778878)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 25 Feb 2011 03:34:15 +0000 (03:34 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 25 Feb 2011 03:34:15 +0000 (03:34 +0000)

Trivial merge