Eloy Lafuente (stronk7) bc6a79aee6 Merge branch '43688-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-27 23:58:18 +01:00
..