Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2013-11-07 12:23:25 +08:00
commit 81b07e655c
12 changed files with 177 additions and 160 deletions

File diff suppressed because one or more lines are too long