Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 17 Dec 2014 03:48:42 +0000 (11:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 17 Dec 2014 03:48:42 +0000 (11:48 +0800)
commitceb7769a29fc801d6e05056ae8d5c1107a9da271
tree28a39b3d2db466a811968b013530db28812e8574
parenta646812d1b00c4df29530f8e0067089598077f5a
parentd0508fdc09f3fecb08acc22317dc524e4065d3b4
Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle

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