Merge branch 'MDL-44906-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 03:42:36 +0000 (11:42 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 03:42:36 +0000 (11:42 +0800)

Trivial merge