projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03faf13 5d778cf)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 7 Jun 2010 11:19:14 +0000 (12:19 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 7 Jun 2010 11:19:14 +0000 (12:19 +0100)

Trivial merge