Merge branch 'wip-MDL-36339-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Dec 2012 20:36:42 +0000 (21:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Dec 2012 20:36:42 +0000 (21:36 +0100)
1  2 
theme/magazine/style/core.css

Simple merge