projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73c2bf6 77badd8)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 19 May 2015 08:31:12 +0000 (09:31 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 19 May 2015 08:31:12 +0000 (09:31 +0100)
1  2 
core/hostmanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/hostmanager.lua
Simple merge