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)
commitd937f597e7dd908ded76a8a38caec821272a2488
treed299ec6863814a624b22b6e996402c0a646d3a3b
parent82053086bcf41096af40efc164f4d66a38c41d9c
parent5689fb0bc8a8f35ffb5e6843ff018370ea693083
Merge branch 'w47_MDL-36719_m24_borkedcachingfront' of git://github.com/skodak/moodle