Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Sep 2014 00:23:08 +0000 (12:23 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Sep 2014 00:23:08 +0000 (12:23 +1200)
commitbe91dff8bb91e8762a6d954f37f62537f38ad843
treecedca6ee6e3ac9495e314c86dd6996aa9964ca2f
parentdb6c48bfc10a2557571f5559b1eb1dbb681ea06f
parentcb9c6a7dc62701a4fffc93fc05bd2bb134c749be
Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle

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