Merge branch 'MDL-55136_dataobject' of git://github.com/davosmith/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 13:48:13 +0000 (15:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 13:48:13 +0000 (15:48 +0200)

Trivial merge