Comparison

prosodyctl @ 5914:eda2556aa139

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 11 Nov 2013 23:28:53 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
comparison
equal deleted inserted replaced
5911:7051dc27e531 5914:eda2556aa139