Merge branch 'MDL-50497-M30' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 1 Jul 2015 00:54:28 +0000 (08:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 1 Jul 2015 00:54:28 +0000 (08:54 +0800)
commitb4d7038a88db02f057e3d580674bc1f1c5ce17d0
tree04bec506fd13e4f28aee4ce4ee4f0d1b0a8930cc
parente96e66aa16dca5cbcdb1aef0f9499edf86f1404b
parentd8d65e76e07e18abe5a100b7074ece9aeef73cec
Merge branch 'MDL-50497-M30' of git://github.com/lazydaisy/moodle

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