Merge branch 'MDL-45298-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 Apr 2014 06:15:40 +0000 (14:15 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Apr 2014 06:15:40 +0000 (14:15 +0800)

Trivial merge