projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48a9367 611b86d)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 3 Jun 2011 04:35:22 +0000 (05:35 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 3 Jun 2011 04:35:22 +0000 (05:35 +0100)

Trivial merge