Comparison

prosodyctl @ 5821:7974683a9bb7

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 03 Sep 2013 13:43:39 +0200
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
comparison
equal deleted inserted replaced
5819:441876452b9c 5821:7974683a9bb7