Merge branch 'w46_MDL-30349_m22_filestatcaching' of git://github.com/skodak/moodle

author Aparup Banerjee <aparup@moodle.com>

Tue, 22 Nov 2011 03:33:55 +0000 (11:33 +0800)

committer Aparup Banerjee <aparup@moodle.com>

Tue, 22 Nov 2011 03:33:55 +0000 (11:33 +0800)
author Aparup Banerjee <aparup@moodle.com>
Tue, 22 Nov 2011 03:33:55 +0000 (11:33 +0800)
committer Aparup Banerjee <aparup@moodle.com>
Tue, 22 Nov 2011 03:33:55 +0000 (11:33 +0800)
diff --cc lib/setuplib.php
Simple merge
diff --cc theme/image.php
Simple merge
diff --cc theme/javascript.php
Simple merge
diff --cc theme/styles.php
Simple merge
author	Aparup Banerjee <aparup@moodle.com>
	Tue, 22 Nov 2011 03:33:55 +0000 (11:33 +0800)
committer	Aparup Banerjee <aparup@moodle.com>
	Tue, 22 Nov 2011 03:33:55 +0000 (11:33 +0800)
		1	2
lib/setuplib.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/image.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/javascript.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/styles.php	patch \|	diff1 \|	diff2 \|	blob \| history