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)
commitd66464d5ea0a69c47f2f49ace9de2f4b7b8c4d62
tree7a9b4a147c36e030a80a2c877b46eed6cb7e7499
parentaef0283bdf24c94d640a16ccac08191980ae7a25
parentf6c58d14e3e156bce6e166b8e4f9fbd9cd78f9d4
Merge commit 'origin/master' into fusionax
classes/user.php