comparison core/usermanager.lua @ 7005:4b024f29e40d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 13 Dec 2015 21:22:26 +0100
parents 0ce2b400663b
children 1295e14614f4
comparison
equal deleted inserted replaced
7003:4aa5f6896057 7005:4b024f29e40d