Merge branch '43688-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 22:58:18 +0000 (23:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 22:58:18 +0000 (23:58 +0100)
commitbc6a79aee6fe5e350e59d43bc0fd83e3fad25ffa
tree301b457364e2100f70966f5c2a1cddfe70b257cf
parent835ef9d84c5a85501f750acdcda38a33aff87f3e
parent5a3e5fa0785794cd7a61aac3f0edc87e0e6f3f37
Merge branch '43688-27' of git://github.com/samhemelryk/moodle

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