projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0ebbb6 6f766ca)
Merge with 0.9
authorMatthew Wild <mwild1@gmail.com>
Wed, 8 Feb 2012 15:20:07 +0000 (16:20 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 8 Feb 2012 15:20:07 +0000 (16:20 +0100)
1  2 
util/prosodyctl.lua patch | diff1 | diff2 | blob | history

diff --cc util/prosodyctl.lua
Simple merge