Comparison

prosodyctl @ 6442:0f4025abbe8f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Sep 2014 01:56:22 +0200
parent 6405:61801dacc90b
child 6486:64146196b142
comparison
equal deleted inserted replaced
6432:388786af0dd2 6442:0f4025abbe8f