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)
commitabd3fdc97760beebe2846e6697236744c414ce74
tree2cedbc37d3f8a7a3ba765d3a0aaabb347592c0e0
parent0730ddc2ad6d9ea9620aec31324c56356fb2ae93
parent453adb1adfa21fba96d7272bb853702f4aea3af1
Merge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle
mod/data/lang/en/data.php
mod/data/lib.php