Diff

prosodyctl @ 6745:6728ad041761

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 25 Jun 2015 18:57:43 +0200
parent 6711:76683a3f3d75
child 6751:18f18bceb662
line wrap: on
line diff