Merge branch 'MDL-39319-master' of git://github.com/mastnym/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 1 Jul 2015 09:04:37 +0000 (11:04 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 1 Jul 2015 09:04:37 +0000 (11:04 +0200)

Trivial merge