comparison core/usermanager.lua @ 6347:e1a7ccd82fce

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Aug 2014 10:31:18 +0200
parents 47c2f71d8314
children 8495734da243
comparison
equal deleted inserted replaced
6343:e6839156bb82 6347:e1a7ccd82fce