projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3cda0f 9394294)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Tue, 13 Jan 2009 15:29:00 +0000 (15:29 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 13 Jan 2009 15:29:00 +0000 (15:29 +0000)
1  2 
core/modulemanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/modulemanager.lua
Simple merge