Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 11 Oct 2011 09:08:46 +0000 (11:08 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 11 Oct 2011 09:08:46 +0000 (11:08 +0200)
commit673e56aa757fce4ea57c27ab2c0d5ce87d713e51
tree7cb95b20b3fa78d046f8c801a445d8c50932f666
parentb8f7731b34d2c75a048672f053c8f8d13e68d6b0
parent6278dfc0a07159cdcb95b29493a860b218b3c26d
Merge branch 'xorg/maint' into xorg/master
modules/payment/money/paypal.inc.php