Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 07:38:22 +0000 (15:38 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 07:38:22 +0000 (15:38 +0800)

Trivial merge