Merge branch '39459-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 12:17:32 +0000 (13:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 12:17:32 +0000 (13:17 +0100)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge