Merge branch 'MDL-49661-master-pluginfotodo' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 13:37:44 +0000 (14:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 13:37:44 +0000 (14:37 +0100)

Trivial merge