Merge branch 'fusionax' into account
authorVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 10 Apr 2009 17:19:42 +0000 (19:19 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 10 Apr 2009 17:19:42 +0000 (19:19 +0200)
commit2f8bacc215bab9d9e3401e73004574cfb0eb4540
tree0db564b36d524e3b2c89c70078a5a02eed7d04a6
parent483da16573717c21c7e6da3eacc094048ab7d72f
parentaef0283bdf24c94d640a16ccac08191980ae7a25
Merge branch 'fusionax' into account

Conflicts:
Makefile
core
htdocs/javascript/.gitignore
modules/admin.php
modules/googleapps.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
Makefile
htdocs/javascript/.gitignore
modules/admin.php
modules/axletter.php
modules/email.php
modules/googleapps.php