projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e23a206 a15d731)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Mon, 1 Mar 2010 16:23:51 +0000 (16:23 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 1 Mar 2010 16:23:51 +0000 (16:23 +0000)

Trivial merge