projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e8ce7c 901108e)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 15 Apr 2011 21:46:57 +0000 (22:46 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 15 Apr 2011 21:46:57 +0000 (22:46 +0100)

Trivial merge