projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 999d49c 69ee95c)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 8 Jan 2011 23:21:28 +0000 (23:21 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 8 Jan 2011 23:21:28 +0000 (23:21 +0000)

Trivial merge