comparison util/prosodyctl.lua @ 5751:3dd3bb40df56

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 15 Jul 2013 23:35:49 +0100
parents e9090966c803
children bd0ff8ae98a8 fb1535328ac7
comparison
equal deleted inserted replaced
5749:60b3b6d27364 5751:3dd3bb40df56