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

Trivial merge