Merge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 00:49:10 +0000 (01:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 00:49:10 +0000 (01:49 +0100)
commit381ffd46fc89c724828d4721298be465f0b47d9d
treef6d4a82a69be986ed4d4673a7880de0af8a7fd2a
parent18ceea60afa4c4c8d5a30c4852aa121db36f905c
parent0ae903bd5f5006d850c12160efc26a3a4eab367a
Merge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/base/style/core.css
theme/base/style/core.css