Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 22:59:27 +0000 (23:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 22:59:27 +0000 (23:59 +0100)
commit221e6adaa55bd5949774cc70f8d3e0e17d170ea0
tree9b9d994a4ada789fd965d0a96f22ad1afd2d5c95
parent9a170849d78a7e3c606eec7fc01e77af026530b9
parent70a0ae96aa202748df17e6b518c2c89951c1cad2
Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle

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