projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bff8a6 2db5c5a)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 18 Mar 2010 10:11:11 +0000 (10:11 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 18 Mar 2010 10:11:11 +0000 (10:11 +0000)

Trivial merge