projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af93234 dd661dc)
Merge with 0.7 (and indirectly 0.6.2)
authorMatthew Wild <mwild1@gmail.com>
Mon, 15 Mar 2010 03:18:33 +0000 (03:18 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 15 Mar 2010 03:18:33 +0000 (03:18 +0000)

Trivial merge