projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6271bf4 ea880f0)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 18 Mar 2010 01:44:55 +0000 (01:44 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 18 Mar 2010 01:44:55 +0000 (01:44 +0000)

Trivial merge