From: Kim Alvefur Date: Fri, 24 Jun 2016 13:11:06 +0000 (+0200) Subject: Merge 0.9->0.10 X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=edc4a8042744ed9d49c079f11a10acfce126a6df;hp=cacc6991eb55b8bc539e69edf4d1195ce17042b6;p=prosody.git Merge 0.9->0.10 ---