Merge branch 'MDL-42535-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 05:47:00 +0000 (13:47 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 05:47:00 +0000 (13:47 +0800)

Trivial merge