Eloy Lafuente (stronk7) 4067991016 Merge branch '48206-29' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-11-19 21:28:51 +01:00
..