Comparison

prosodyctl @ 6749:9dc05d3efdc9

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Jul 2015 18:00:05 +0200
parent 6711:76683a3f3d75
child 6751:18f18bceb662
comparison
equal deleted inserted replaced
6745:6728ad041761 6749:9dc05d3efdc9