Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 06:37:55 +0000 (14:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 06:37:55 +0000 (14:37 +0800)
commit93ab0810256cf90b05e237391088470e96092b2d
tree83ef0b48831ce045dfdefd6d2b0e9e7fa6de1681
parente404e040d345efdab85b198e24ab3ea72e8a7612
parent873dfb360893a5805fcdaf7f4a0f8eff47e3a85e
Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle

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