Merge commit 'origin/fusionax' into account
authorVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 10 Apr 2009 16:48:39 +0000 (18:48 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 10 Apr 2009 16:48:39 +0000 (18:48 +0200)
commit483da16573717c21c7e6da3eacc094048ab7d72f
tree440638072ed570ec1380bac2f68c5f6affa070f6
parent2db80ab6f7d054ec274c66f7ba983f49596b81cf
parent4d336f59bad0da6714bc69fd71aa94056bc455c1
Merge commit 'origin/fusionax' into account

Conflicts:
modules/admin.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
Makefile
include/wiki/farmconfig.php
modules/admin.php
modules/profile.php
modules/profile/jobs.inc.php
modules/profile/mentor.inc.php
templates/xnetgrp/inscrire.tpl