projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe6db19 74970b2)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Wed, 29 Jul 2009 17:11:37 +0000 (18:11 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 29 Jul 2009 17:11:37 +0000 (18:11 +0100)
1  2 
prosody patch | diff1 | diff2 | blob | history

diff --cc prosody
Simple merge