Merge branch 'MDL-45283-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 02:40:14 +0000 (10:40 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 02:40:14 +0000 (10:40 +0800)

Trivial merge