Comparison

prosodyctl @ 5858:89b16a160cbc

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 06 Oct 2013 23:53:15 +0200
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
comparison
equal deleted inserted replaced
5855:275d4da9404f 5858:89b16a160cbc