Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Jun 2014 21:51:37 +0000 (09:51 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Jun 2014 21:51:37 +0000 (09:51 +1200)
commit0591c2056d315f8445334ada4bed261ca1d3eafb
treeefeb95aa68debb646ebee143c50447ea35c468f6
parent71fa28477bfa25bceffa95b8ab2147f90d5d6ec0
parent72704adf0349039ecfbd2d64ac0f76a3ec89d913
Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
lang/en/moodle.php
lib/weblib.php
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css