Merge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 10:48:49 +0000 (11:48 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 10:48:49 +0000 (11:48 +0100)
1  2 
mod/data/lang/en/data.php
mod/data/lib.php

Simple merge
Simple merge