Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:20:28 +0000 (00:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:20:28 +0000 (00:20 +0100)
commitb0512f418b8a2efdff3680d49a24e7636997c9fe
treecf0de95d4b0c7e479e0076d14f6a9bad8bf48ca6
parent1816a46d1112339febfd0ca10ad90315943d2627
parentfdbb0397137b079063db76a88c3ccbaa77d7dee9
Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle

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