Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 May 2012 13:10:49 +0000 (21:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 May 2012 13:10:49 +0000 (21:10 +0800)
1  2 
theme/image.php

diff --cc theme/image.php
Simple merge