projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: accfc1c bc3fb0b)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 23:47:35 +0000 (00:47 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 23:47:35 +0000 (00:47 +0100)

Trivial merge