Merge branch 'MDL-39376-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Nov 2014 17:21:09 +0000 (17:21 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Nov 2014 17:21:09 +0000 (17:21 +0000)

Trivial merge