From: Dan Poltawski <dan@moodle.com>
Date: Wed, 14 Nov 2012 03:32:52 +0000 (+0800)
Subject: Merge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle
X-Git-Tag: v2.4.0-rc1~188
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=7fc7a8b94cfe2954e65455ccf2836d5e2658eef3

Merge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle
---

7fc7a8b94cfe2954e65455ccf2836d5e2658eef3