Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 08:54:36 +0000 (09:54 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 08:54:36 +0000 (09:54 +0100)

Trivial merge