comparison plugins/mod_presence.lua @ 7982:e30b0cbed472

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 16 Mar 2017 23:49:27 +0100
parents b1f80447a2b1
children c3790ca4144f
comparison
equal deleted inserted replaced
7974:547f000941cf 7982:e30b0cbed472