Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 08:31:17 +0000 (16:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 08:31:17 +0000 (16:31 +0800)

Trivial merge