Merge branch 'w49_MDL-35456_m23_paypal' of git://github.com/skodak/moodle into MOODLE...
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 04:03:33 +0000 (12:03 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 04:03:33 +0000 (12:03 +0800)

Trivial merge