Merge branch 'MDL-40833-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 08:00:52 +0000 (16:00 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 08:00:52 +0000 (16:00 +0800)

Trivial merge