Comparison

prosodyctl @ 5285:19381ed1cc02

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 29 Dec 2012 19:13:42 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
comparison
equal deleted inserted replaced
5283:a3a4de5104ee 5285:19381ed1cc02