Merge branch 'wip-MDL-37333_master' of git://github.com/gjb2048/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 02:27:11 +0000 (10:27 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 02:27:11 +0000 (10:27 +0800)
1  2 
theme/index.php

diff --cc theme/index.php
Simple merge