Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxie...
authorDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 15:20:17 +0000 (15:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 15:20:17 +0000 (15:20 +0000)

Trivial merge