projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b82b044 34e1c42)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2010 18:57:55 +0000 (18:57 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2010 18:57:55 +0000 (18:57 +0000)

Trivial merge