Merge branch 'wip-MDL-46470-m26' of git://github.com/marinaglancy/moodle into MOODLE_...
commit934a342fef363573d54a38be7c6119a4c8af3ba3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Aug 2014 22:26:27 +0000 (13 00:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Aug 2014 22:26:27 +0000 (13 00:26 +0200)
treed566c23d8f3053c34c79c9da7f31f70ac900e2f0
parentb483b31dab915d19dc8956e1909d2caebc31cf52
parentfaf858b6d406f623a9eb51e2732f5f9742de9701
Merge branch 'wip-MDL-46470-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
theme/bootstrapbase/style/moodle.css