comparison core/rostermanager.lua @ 8068:5abb6bc45edd

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Apr 2017 01:25:58 +0200
parents 8acc35b5355a
children d44c6582059d
comparison
equal deleted inserted replaced
8065:36d9c1226fbc 8068:5abb6bc45edd