Merge branch '41226-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 03:11:10 +0000 (11:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 03:11:10 +0000 (11:11 +0800)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge