projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66bcb01 baa1bbd)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 16:43:05 +0000 (16:43 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 16:43:05 +0000 (16:43 +0000)

Trivial merge