Merge branch 'wip-MDL-39746-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 03:24:31 +0000 (11:24 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 03:24:31 +0000 (11:24 +0800)
commitfd6f924c0877a9013da4ccda26113d319b0cfe43
tree09a8d10c8435cd2c4a8bcd6ee6abec5a92578367
parentae82c2858895baa9a0d41c3a6d07d7e78e616a46
parent41d648306651642a854acc03ff17f2297e9a7015
Merge branch 'wip-MDL-39746-master' of git://github.com/phalacee/moodle

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