Sam Hemelryk 19dfbe3001 Merge branch 'MDL-40674_master' of https://github.com/nadavkav/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-15 16:47:38 +12:00
..