Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 08:00:18 +0000 (16:00 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 08:00:18 +0000 (16:00 +0800)
commite2ac6a848b5410aef725fefd0f6f541b79084513
tree95128299eb728c1167281c2b82f44efee8e893db
parent75eb51818cf505a5a63132d182aebb18a06ddd27
parent3355b72e3be147de967dd33dda5b34be6509aca8
Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/style/moodle.css