Merge branch 'master' into fusionax
authorVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 30 Jul 2009 15:18:25 +0000 (17:18 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 30 Jul 2009 15:18:25 +0000 (17:18 +0200)
commit8a43972f58f0a77015ae9e509f1c073d188874d2
tree0cc4447b5dcbff6d16be15c35b762f171ad7b1d1
parent20f354f5992637e664fa71f98200289ed913d6c0
parent19b00bcab8013c805bbc0e6a99868382480ce365
Merge branch 'master' into fusionax

Conflicts:
ChangeLog

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