Sam Hemelryk 642ad27297 Merge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-10 09:06:31 +13:00
..