Merge branch 'MDL-43323-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 02:34:40 +0000 (10:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 02:34:40 +0000 (10:34 +0800)

Trivial merge