projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a652eb7 f62f6f5)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 20 Apr 2011 17:20:29 +0000 (18:20 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 20 Apr 2011 17:20:29 +0000 (18:20 +0100)

Trivial merge