Merge branch 'MDL-40752-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 01:24:53 +0000 (09:24 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 01:24:53 +0000 (09:24 +0800)
commit34e91c304c301319c085fb4a912be9f0c4262ad7
tree1ce94a1b4ec6cd91029f97986aa6ae79aaeea926
parentf05e25d208f1007b7ee054c7dc8cf1ce87f4e4d3
parent0954819fc7adcffb8f3ebd4f6adfc0fd55797c28
Merge branch 'MDL-40752-master' of git://github.com/phalacee/moodle

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