Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 01 May 2013 13:45:42 +0100
changeset 5554 e91db0aac408
parent 5543 d3f5165c4113 (diff)
parent 5553 7baf59444b31 (current diff)
child 5557 b0288fe8226f
Merge 0.9->trunk
prosodyctl
util/rfc3484.lua