Merge branch 'w11_MDL-31956_m23_paypal' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 20:36:36 +0000 (21:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 20:36:36 +0000 (21:36 +0100)

Trivial merge