Merge branch 'MDL-42980' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 04:56:17 +0000 (12:56 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 04:56:17 +0000 (12:56 +0800)
commit3ab0a93347a8ef5046da7977e105f708966b45e7
tree462e44fe712588f1fbc416f01271f75619a313b0
parent6d7d401711b549a391d418cb55c46b27b3e60add
parentf3f180863f8df17f091e2df3f3e6b72653be2259
Merge branch 'MDL-42980' of git://github.com/rwijaya/moodle

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