Merge branch 'MDL-40716-master' of https://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Apr 2014 07:18:59 +0000 (15:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Apr 2014 07:18:59 +0000 (15:18 +0800)

Trivial merge