projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f89c6e1 00ec883)
Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Wed, 29 Apr 2009 01:08:55 +0000 (02:08 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 29 Apr 2009 01:08:55 +0000 (02:08 +0100)
1  2 
core/componentmanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/componentmanager.lua
Simple merge