Sam Hemelryk 6455dec02d Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-08 08:48:43 +13:00
..