Sam Hemelryk 9fdb1c1a63 Merge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrap/style/generated.css
2013-04-22 10:35:52 +12:00
..
2013-03-22 13:09:50 +01:00