Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Nov 2010 21:18:19 +0000 (22:18 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Nov 2010 21:18:19 +0000 (22:18 +0100)
commit905cda00459649fa751c2ea292e079f5f05cae81
tree59ceede3b1e5eb6f6faa62a8b4628c575183fb3b
parent243cdb7b0cefff168039e1fc9c112cebdcdd53e7
parente93c4b93bd3ec94e7d4be48112d7deffd8511399
Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master

Conflicts:
ChangeLog
core
modules/payment.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
ChangeLog
modules/admin.php
modules/email.php
modules/events.php
modules/payment.php
modules/profile.php
modules/search.php
modules/xnetgrp.php