Diff

core/rostermanager.lua @ 7110:a2d096203b7f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 28 Jan 2016 15:11:33 +0100 (2016-01-28)
parent 7064:b98006bfd97a
child 7154:b3b92204802f
line wrap: on
line diff