projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd95fdb 5eb7c9c)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 26 Feb 2011 00:24:23 +0000 (00:24 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 26 Feb 2011 00:24:23 +0000 (00:24 +0000)

Trivial merge