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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge