David Monllao b4d7038a88 Merge branch 'MDL-50497-M30' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2015-07-01 08:54:28 +08:00
..