Merge branch 'MDL-45611-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jun 2014 23:11:25 +0000 (01:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jun 2014 23:11:25 +0000 (01:11 +0200)
commit3a2421a56ecc6b70051ed4bb309cf08078a4b83b
tree7361cb619eed789b6ba101413fc06dbcc9a3686a
parentcf7ac0aebf92a829535c7709b137cdb8e50b0d36
parent05562aaf6f7c42dcf76a8ef3e2da6c5c729410b2
Merge branch 'MDL-45611-master' of git://github.com/phalacee/moodle

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