Comparison

plugins/mod_roster.lua @ 6560:6f39c58bdcc4

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 26 Jan 2015 15:27:19 +0100
parent 5776:bd0ff8ae98a8
child 6613:2aae36312eb9
comparison
equal deleted inserted replaced
6557:8aa967c81cbc 6560:6f39c58bdcc4