Merge branch 'MDL-40082_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 10:16:11 +0000 (12:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 10:16:11 +0000 (12:16 +0200)
commit3b117e79ce4092fc578897072586885468dd7c5d
tree80350bac90382932d2a5a1885c787d98b329e105
parentd96fcecc86d7f9096ef20eb602070c9600e02151
parent94462b56def01a9925cc44e33650fcfde0573e7a
Merge branch 'MDL-40082_master' of https://github.com/nadavkav/moodle

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