Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 20:51:59 +0000 (08:51 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 20:51:59 +0000 (08:51 +1200)
commitec18f333bdebda9f21a8c8d5382f15311d206526
treecf6fa7d17832f77ba5b646466ee0f6fc83cf1048
parent754fa1091627ecb6285c984daabf878bc52a87ff
parent70d7e9141ff2368a955113c9795ebc0df658601a
Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle

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