Merge branch 'MDL-45076-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 01:10:28 +0000 (09:10 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 01:10:28 +0000 (09:10 +0800)
commit30a3b12f88470a347f1afcbb82b3d00c58e6fc49
tree2f009477cc9f4a6d2724dbac111c2d8d179f264b
parentc87a54102e4aa9ed4dde0603168a901c490caf28
parentf82bc6be017680060677979be3e6b37fa690ad65
Merge branch 'MDL-45076-master' of git://github.com/FMCorz/moodle

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