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

Trivial merge