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)
commitd89a495539357b3ad30f7b891bd23d1805355a52
treecf2f12e091ce0e39040625991a21372e66604416
parent173ff0bdf41db90ee0995e0c3bf844bf2151d0e6
parent86668a58a94fc57493a335eb75a37171238c0220
Merge branch 'xorg/maint' into xorg/master
modules/payment.php