Merge branch 'MDL-51179-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Sep 2015 07:57:21 +0000 (15:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 1 Sep 2015 07:57:21 +0000 (15:57 +0800)
commit9f6a55f7ea9b7742783ea1ae73cf6cda29aac39d
treeb231331d80eee2b162c2e4544bf292862e2642ff
parenteb41f5539e7f103915e4384b02c755f237031d92
parent988592c556093afb0c1d330adbde9202a4176814
Merge branch 'MDL-51179-master' of git://github.com/damyon/moodle

Conflicts:
lib/upgrade.txt
lib/upgrade.txt
mod/data/field/textarea/field.class.php
mod/data/templates.php