Merge branch '45828-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 08:33:01 +0000 (09:33 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 08:33:01 +0000 (09:33 +0100)
1  2 
cache/renderer.php

Simple merge