projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6931622 6c541b4)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 24 May 2010 15:52:12 +0000 (16:52 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 24 May 2010 15:52:12 +0000 (16:52 +0100)

Trivial merge