Merge branch 'MDL-22351' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 01:31:21 +0000 (02:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 01:31:21 +0000 (02:31 +0100)
commit509361cfde22184d11160e90c73e0a23c0e45117
treef7ca969d03877446407dbd36ad2bc26050dba461
parent8c93ab4e0f53f5447abe43815eaed0b380d3be9d
parent0a52611c5a253a241009634e7ee32fc01ee9a0f4
Merge branch 'MDL-22351' of git://github.com/lazydaisy/moodle

Conflicts:
theme/anomaly/style/general.css

Merged with some changes done with the introduction of
the new report plugins (MDL-29030)
theme/anomaly/style/general.css