Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 02:15:27 +0000 (14:15 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 02:15:27 +0000 (14:15 +1200)

Trivial merge