projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7901fd6 3ab9f90)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 23:58:09 +0000 (00:58 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 23:58:09 +0000 (00:58 +0100)

Trivial merge