Merge branch 'MDL-44328-M27' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 00:02:51 +0000 (01:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 00:02:51 +0000 (01:02 +0100)
commita4627988fd9f79648ebbf3eb3631fb31fb8a532f
treefa036db6bd9cfdce6c49b9837f4c0f7e2a728198
parente68fc3c6f1bcfa25cf28cc517cd978a99aad65df
parent457c1208d90f3d88c1badbb5d9f6b1deacfdb402
Merge branch 'MDL-44328-M27' of git://github.com/lazydaisy/moodle

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