Merge branch 'MDL-47576-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Oct 2014 15:59:06 +0000 (16:59 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Oct 2014 15:59:06 +0000 (16:59 +0100)
commit529e38d141e173ec832d1977e95f1a1becd16575
tree6daf1367b67a1ce523be587c135e2b397b71ded7
parent33ccfc1f13efb29b1ca470e6ab6b156c1c7d92ce
parentf89a85f81ce8cf7b52993d8d73ef59b1a1a92038
Merge branch 'MDL-47576-master' of git://github.com/jethac/moodle

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