Merge branch 'MDL-34377' of git://github.com/raymondAntonio/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:11:37 +0000 (14:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:11:37 +0000 (14:11 +0800)

Trivial merge