Merge branch 'xorg/maint' into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 9 Sep 2011 22:37:24 +0000 (00:37 +0200)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 9 Sep 2011 22:37:24 +0000 (00:37 +0200)
1  2 
modules/payment.php

Simple merge