Merge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 03:32:52 +0000 (11:32 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 03:32:52 +0000 (11:32 +0800)

Trivial merge