Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:27:03 +0000 (09:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:27:03 +0000 (09:27 +1300)
commitb9c16d401a25c00fc7c67965596eb4c6bb421aad
treeaca2fb79d1256916cc50021434cf072916af174d
parenteafbd56da9038cd1aac2b06dd2200d476235bd41
parent7105ac89bd39bfd7883c476a924c13c46ca8be35
Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle

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