Merge branch 'MDL-42534-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 02:51:44 +0000 (10:51 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 02:51:44 +0000 (10:51 +0800)

Trivial merge