Merge branch 'fusionax' into account
authorVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 30 Jul 2009 15:19:31 +0000 (17:19 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 30 Jul 2009 15:19:31 +0000 (17:19 +0200)
commitc12cc82e1d97b51e19b294942ea9450a34d929cd
tree7191797e8358fe3a3614a8c02242bef04882c747
parentc7c2a1818455e60777fbd203756b2366bd9939c1
parent8a43972f58f0a77015ae9e509f1c073d188874d2
Merge branch 'fusionax' into account

Conflicts:
include/banana/hooks.inc.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
classes/user.php
include/banana/hooks.inc.php
modules/register.php
modules/register/register.inc.php
templates/carnet/mescontacts.tpl