Merge branch 'MDL-40544_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 20:39:13 +0000 (22:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 20:39:13 +0000 (22:39 +0200)
commit01994ecee98c7974398962550b7cb33e2984fc67
tree36e4ca36175fa7955a157d973e48f76f02026b66
parent6aa9735cb0c2065eaefdb2f04b6479e541c9128e
parent54e0dbe89aac40447092aafb05efa5b8d49b1578
Merge branch 'MDL-40544_master' of https://github.com/nadavkav/moodle

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