Merge branch 'MDL-40589_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 20:34:16 +0000 (22:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 20:34:16 +0000 (22:34 +0200)
commit6aa9735cb0c2065eaefdb2f04b6479e541c9128e
tree08a2971b28eff79547e7379d956c58a781c2f9d9
parent6abf3556fd8e1c34abf6a336e1c5a0e962813d82
parent2746c04b4318dca5f39d72ae62b7364552622fa3
Merge branch 'MDL-40589_master' of https://github.com/nadavkav/moodle

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