Merge branch 'MDL-48918-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 15:06:34 +0000 (15:06 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 15:06:34 +0000 (15:06 +0000)

Trivial merge