Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle

Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Eloy Lafuente (stronk7) 2013-09-17 19:59:55 +02:00
commit 58c9faeaca
18 changed files with 1522 additions and 104 deletions

File diff suppressed because one or more lines are too long