Merge branch 'wip-MDL-51259-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Sep 2015 14:24:53 +0000 (16:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Sep 2015 13:37:12 +0000 (15:37 +0200)
1  2 
mod/data/lib.php

Simple merge