Merge branch 'mdl41304-master' of git://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 08:05:38 +0000 (16:05 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 08:05:38 +0000 (16:05 +0800)

Trivial merge