projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9eb74b 8883b27)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 18 May 2010 22:29:44 +0000 (23:29 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 18 May 2010 22:29:44 +0000 (23:29 +0100)

Trivial merge