Merge branch 'wip-MDL-25630_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 03:23:12 +0000 (11:23 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 03:23:12 +0000 (11:23 +0800)
1  2 
index.php

diff --cc index.php
Simple merge