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

Trivial merge