Diff

prosodyctl @ 6090:61403eb023bf

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 21 Apr 2014 02:43:38 +0200
parent 6062:6cc6b4d407df
child 6158:08e9c9d0beb3
line wrap: on
line diff