Merge branch 'MDL-35754-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Oct 2012 02:26:14 +0000 (10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Oct 2012 02:26:14 +0000 (10:26 +0800)

Trivial merge