David Monllao ceb7769a29 Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-12-17 11:48:42 +08:00
..