comparison prosodyctl @ 5273:746f07d280e2

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 28 Dec 2012 03:03:56 +0100
parents da7fe5de82fb
children 19a4a3462574
comparison
equal deleted inserted replaced
5271:f716a3c58b4b 5273:746f07d280e2