Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Apr 2013 22:24:13 +0000 (10:24 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Apr 2013 22:24:13 +0000 (10:24 +1200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge