projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02674f2 122dfbe)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 17:33:37 +0000 (17:33 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 17:33:37 +0000 (17:33 +0000)

Trivial merge