Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 03:42:32 +0000 (15:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 03:42:32 +0000 (15:42 +1200)
commit46921d74a6151cb468b554c99f31d410b0e68c4a
tree94bbedf3a8ccc78d41006195470b67748646ab5a
parentc3c424a05cbc74bec8ce8ad0150776273d3aa1b8
parent376a17e4ae855980e5e8730995d3f33bb9c00131
Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle

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