Merge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 08:52:07 +0000 (16:52 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 08:52:07 +0000 (16:52 +0800)
1  2 
mod/data/edit.php

Simple merge