Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 01:35:50 +0000 (09:35 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 01:35:50 +0000 (09:35 +0800)
commitb5c8e7cbc38c3993022bd0817c4c6210df9aff9a
treec279b7e415c076af8ad9d4886fbcdc3c1a3f52d6
parentf6652bc750f0583eb07ab45aa652324508fad321
parentf802fe7d7f476bf6867c209d90fd0ea7e360dc96
Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle

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