Merge branch 'MDL-40071_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 20:10:08 +0000 (22:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 20:10:08 +0000 (22:10 +0200)
commit172dda0090d5ff8f9421e633a0b724416a7a99cc
tree46f3961802260eca147b958a7a2a7a5f10a275d9
parent18c4d7e68cc8eae1d5ce503adabb8e77c425817a
parente22b3e2ecb74986339cd58c8169074d3f6e5beb5
Merge branch 'MDL-40071_master' of https://github.com/nadavkav/moodle

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