Merge branch 'MDL-45167-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 03:37:13 +0000 (11:37 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 03:37:13 +0000 (11:37 +0800)

Trivial merge