projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2615fb 7cba783)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 11 Jan 2011 04:22:45 +0000 (04:22 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 11 Jan 2011 04:22:45 +0000 (04:22 +0000)

Trivial merge