projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed274c2 0ddddb0)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Feb 2010 21:37:59 +0000 (21:37 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 25 Feb 2010 21:37:59 +0000 (21:37 +0000)

Trivial merge