projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c66cc52 0912ab5)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 18 Mar 2011 10:33:38 +0000 (10:33 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 18 Mar 2011 10:33:38 +0000 (10:33 +0000)

Trivial merge