Comparison

prosodyctl @ 6890:47cd0b4b5544

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 02 Oct 2015 12:13:32 +0200
parent 6845:bb7854355df1
child 6914:5df76208e050
comparison
equal deleted inserted replaced
6888:39c5c49616ab 6890:47cd0b4b5544