Merge branch 'w31_MDL-40887_m26_minify' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 08:49:39 +0000 (16:49 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 08:49:39 +0000 (16:49 +0800)

Trivial merge