Merge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:31:55 +0000 (22:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:31:55 +0000 (22:31 +0800)

Trivial merge