Merge branch '44154-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:55:19 +0000 (00:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:55:19 +0000 (00:55 +0100)
commit79272452888087718423af6314ad42165fdd192b
tree37f5e0d9433b3f8ff95ae669be2e330635a38225
parentb629de817a1236a5154c96b3409ebde474cc05d0
parent002a2a44a7b7707cf37fc4b97b87d2f1d573ab75
Merge branch '44154-27' of git://github.com/samhemelryk/moodle
mod/data/edit.php
mod/data/field.php
mod/data/index.php
mod/data/lang/en/data.php
mod/data/lib.php
mod/data/templates.php