Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 04:17:16 +0000 (12:17 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 04:17:16 +0000 (12:17 +0800)
commitbfa4c3f3587bc7fe6d02eb4672de3ded751348a0
tree9a4bc306e891ba52c6bb804220c9aaf7f3a95b11
parent6f44a7336959bacba07db161ae47dac9bfc906c2
parentea8c248c9670f28d0f331481f4e212e0d02b0db6
Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
lib/outputrequirementslib.php
theme/base/style/core.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css