projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c53ddcd ab49978)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 6 Apr 2011 13:48:00 +0000 (14:48 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 6 Apr 2011 13:48:00 +0000 (14:48 +0100)

Trivial merge