Diff

core/rostermanager.lua @ 6868:dcf9ceac9265

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 Sep 2015 18:08:25 +0200 (2015-09-25)
parent 6787:ad64e2eacd0e
child 7064:b98006bfd97a
line wrap: on
line diff