Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 15:29:20 +0000 (23:29 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 15:29:20 +0000 (23:29 +0800)
commit73cb5874b6fe67c0f30aee8413c219e6d3a83344
tree3971c2d179a4c21378e18e7a6fd0f3626f431e5b
parent0758665c0d2b24987df85b9c9e21213798f28c9a
parent810a3da1334fff57b1c323898789d6a30978798e
Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle

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