Merge branch 'fusionax' into account
authorVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 6 Aug 2009 17:15:13 +0000 (19:15 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 6 Aug 2009 17:15:13 +0000 (19:15 +0200)
commit5b516e6be17378ace0e375b9da14a46051bf0f4e
tree6a1fdb3d9f0976fdb23940046499bbdd86c68e59
parentc12cc82e1d97b51e19b294942ea9450a34d929cd
parent96d80a35f4abef2b94d2f2b8f5442230141398d1
Merge branch 'fusionax' into account

Conflicts:
modules/admin.php
templates/admin/user.tpl

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
modules/axletter.php
modules/axletter/axletter.inc.php
templates/admin/user.tpl