projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cee7f31 89c6fc5)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 24 May 2010 18:46:12 +0000 (19:46 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 24 May 2010 18:46:12 +0000 (19:46 +0100)

Trivial merge