Merge branch 'fusionax' into account
authorVincent Zanotti <vincent.zanotti@m4x.org>
Sat, 11 Apr 2009 01:20:01 +0000 (03:20 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Sat, 11 Apr 2009 01:20:01 +0000 (03:20 +0200)
commit89274a92006f2e3d3124667cd77525f7d01f8012
tree8ea524e62f81f2746c3e8fcedd37f0e61a03f20d
parent7679a55aa7f1016e45ccf4df79b7e41440c9cce6
parentd66464d5ea0a69c47f2f49ace9de2f4b7b8c4d62
Merge branch 'fusionax' into account

Conflicts:
classes/user.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
classes/user.php