Merge branch 'MDL-38369-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 02:25:08 +0000 (10:25 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 02:25:08 +0000 (10:25 +0800)

Trivial merge