Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 21:08:46 +0000 (22:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 21:08:46 +0000 (22:08 +0100)
1  2 
admin/settings/plugins.php
lang/en/admin.php

Simple merge
Simple merge