Merge branch 'MDL-41305-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 09:14:40 +0000 (17:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 09:14:40 +0000 (17:14 +0800)

Trivial merge