Merge branch 'MDL-44941-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 02:30:47 +0000 (10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 02:30:47 +0000 (10:30 +0800)

Trivial merge