Comparison

prosodyctl @ 5572:19e1f9881bfc

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 10 May 2013 22:31:20 +0200
parent 5554:e91db0aac408
child 5584:1d841117117c
comparison
equal deleted inserted replaced
5570:f592409f5fcd 5572:19e1f9881bfc