Merge branch 'MDL-42192-simpledata-unit-test' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Jun 2015 08:34:11 +0000 (09:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jun 2015 05:13:37 +0000 (07:13 +0200)

Trivial merge