Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Apr 2015 07:57:15 +0000 (08:57 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Apr 2015 07:57:15 +0000 (08:57 +0100)

Trivial merge