Merge branch 'MDL-47893-master' of git://github.com/zbdd/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Nov 2014 16:50:47 +0000 (16:50 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Nov 2014 16:50:47 +0000 (16:50 +0000)

Trivial merge