Merge branch 'xorg/1.0.2/master' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 3 Jan 2011 12:30:33 +0000 (13:30 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 3 Jan 2011 12:30:33 +0000 (13:30 +0100)
commitd30b83fa903a8a6f7b88df287884ed80cffff277
tree0506a99726b419b5e4de4ccaa8753cdcd4c2c482
parent77de31c98f05be58870afbaa0cb6ba9f6cbb1799
parent6b3e8ff51a5fc7b87639067de48006982c6a7b97
Merge branch 'xorg/1.0.2/master' into xorg/master
ChangeLog
modules/payment.php