Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 04:11:17 +0000 (12:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 04:11:17 +0000 (12:11 +0800)

Trivial merge