Merge branch 'w47_MDL-36719_m24_borkedcachingfront' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Nov 2012 23:55:18 +0000 (00:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Nov 2012 23:55:18 +0000 (00:55 +0100)

Trivial merge