Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 07:28:51 +0000 (15:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 07:28:51 +0000 (15:28 +0800)
commitccc296670922af2b28ddcd60f59b0b07695a358b
tree5dc21905881e09c4f6f95d4f21edcb12caf4164b
parent6258e288aeeaddbeb726b6a4a7a87bdcd8b490c5
parent7f52dbd8d542ecbb4de7adb29aa476bfa0016971
Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/less/moodle/admin.less
theme/bootstrapbase/style/moodle.css
theme/standard/style/admin.css