Merge remote branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 16 Dec 2010 20:11:38 +0000 (21:11 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 16 Dec 2010 20:11:38 +0000 (21:11 +0100)
commit3c2a69dc96bae79936c677be7fb7554a43c555bc
tree84d85ddeee4fa0a30b3142bf878a8de7e0983a56
parent34c0246248ed6e3c6a372c89b359ce038bb95bc8
parentd2c8403423117200d8eadc963ec58d3f8a3bd1ab
Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
core
modules/payment.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/payment.php
modules/xnetgrp.php