Merge branch 'MDL-49573-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 15:08:22 +0000 (16:08 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 15:08:22 +0000 (16:08 +0100)

Trivial merge