Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 23:52:22 +0000 (12:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 23:52:22 +0000 (12:52 +1300)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge