Diff

core/usermanager.lua @ 7038:22f36a3d6369

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 01 Jan 2016 23:31:13 +0100
parent 6979:0ce2b400663b
child 7177:1295e14614f4
line wrap: on
line diff