comparison core/usermanager.lua @ 6525:7c273da3cff6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Nov 2014 15:01:47 +0100
parents 47c2f71d8314
children 8495734da243
comparison
equal deleted inserted replaced
6516:ecd8d6437053 6525:7c273da3cff6