projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a93b5a5 c488a2c)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 12:33:45 +0000 (12:33 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 12:33:45 +0000 (12:33 +0000)

Trivial merge