Merge branch '36236-29' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Dec 2014 10:48:10 +0000 (10:48 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:11 +0000 (12:04 +0000)
commit4592f677896dfcc598a4177b7a59123795e4a6cc
treee98513e76f9a99fd4db21245b7ea5cd93031b365
parentddb483a4681205a6146796050caf0b64610451b0
parent32bc89811ce1988fe4c8228ac9c111ebba86ff35
Merge branch '36236-29' of git://github.com/samhemelryk/moodle
lang/en/cache.php