Merge commit 'origin/master' into fusionax
authorVincent Zanotti <vincent.zanotti@m4x.org>
Sat, 11 Apr 2009 01:19:01 +0000 (03:19 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Sat, 11 Apr 2009 01:19:01 +0000 (03:19 +0200)
1  2 
classes/user.php

Simple merge