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)
commit3c724b4218ab6bcf7400880ab07e48844f2cb095
tree568e9cda0bb853ea56250aaa284cb9f51a2b5fd1
parenteb4f0d9c84260f9a4c624c8c89780bc1a1034803
parenta106fb81786e9199e0fcf5b80cda31d0c783a2be
Merge branch 'MDL-55136_dataobject' of git://github.com/davosmith/moodle