projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c397c7 f7f0c23)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 11 Apr 2011 16:01:55 +0000 (17:01 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 11 Apr 2011 16:01:55 +0000 (17:01 +0100)

Trivial merge