Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 23 May 2010 22:11:00 +0000 (23:11 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 23 May 2010 22:11:00 +0000 (23:11 +0100)
commit9bd553f671cd8abcd19704598f1d66e4d6eebae5
tree790cd084f0b10e92a585be2ea76ad68e482deb1e
parentf0fbb65e4b29fa759bad537e901b3d8b4f3cebaf
parentb27f0824878aa56b80e440d85ce6b9fdae24c18b
Merge 0.7->trunk
core/usermanager.lua