projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d310f73 527c843)
Merge 0.6/MattJ -> 0.6
authorMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 21:26:14 +0000 (22:26 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 21:26:14 +0000 (22:26 +0100)

Trivial merge