projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0326f6 093e7bb)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 23:05:33 +0000 (00:05 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 23:05:33 +0000 (00:05 +0100)

Trivial merge