Merge branch 'MDL-40139-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 02:33:36 +0000 (10:33 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 02:33:36 +0000 (10:33 +0800)

Trivial merge