projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37105ec fa2df10)
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Sat, 5 Oct 2013 16:15:25 +0000 (12:15 -0400)
committerMatthew Wild <mwild1@gmail.com>
Sat, 5 Oct 2013 16:15:25 +0000 (12:15 -0400)
1  2 
plugins/muc/muc.lib.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/muc/muc.lib.lua
Simple merge