Merge branch 'w51_MDL-37291_m25_paypalrestore' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 09:51:49 +0000 (10:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 09:51:49 +0000 (10:51 +0100)
1  2 
enrol/paypal/lib.php

Simple merge