Merge branch 'MDL-52346' of git://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Feb 2016 06:12:03 +0000 (14:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Feb 2016 06:12:03 +0000 (14:12 +0800)
1  2 
cache/classes/definition.php
lang/en/cache.php
lib/db/caches.php

Simple merge
Simple merge
Simple merge