Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 04:34:53 +0000 (12:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 04:34:53 +0000 (12:34 +0800)
commitdbfdd1a4f9abd416ee73cf00d2b4c6013cb84935
tree6fdf30cf8f724ec76eb62ca8ea005c8d6c96aab9
parent3ef74a63a62366b4d6c56f0f69d0a46d7d14608c
parent86048e8136329a6e2b4436cef2ce02a3193e8089
Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle

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