projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e56f7d 4f2be66)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 13 Feb 2011 22:59:27 +0000 (22:59 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 13 Feb 2011 22:59:27 +0000 (22:59 +0000)

Trivial merge