Sam Hemelryk 0591c2056d Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-06-04 09:51:37 +12:00
..