Merge branch 'MDL-43270-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 09:23:07 +0000 (17:23 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 09:23:07 +0000 (17:23 +0800)

Trivial merge